From 2f2bd60b17c3518f5af60c93b607919741b7e45d Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Fri, 12 Mar 2021 16:24:27 -0800 Subject: [PATCH 01/67] refs #17325 linux 32 --- azure-pipelines.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9006cf6e50cd8..d211785041baa 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,7 +20,7 @@ jobs: Linux_i386: # bug #17325: fails on 'ubuntu-16.04' because it now errors with: # g++-multilib : Depends: gcc-multilib (>= 4:5.3.1-1ubuntu1) but it is not going to be installed - vmImage: 'ubuntu-18.04' + vmImage: 'ubuntu-16.04' CPU: i386 OSX_amd64: vmImage: 'macOS-10.15' @@ -82,11 +82,11 @@ jobs: # Downgrade llvm: # - llvm has to be downgraded to have 32bit version installed for sfml. - cat << EOF | sudo tee /etc/apt/preferences.d/pin-to-rel - Package: libllvm6.0 - Pin: origin "azure.archive.ubuntu.com" - Pin-Priority: 1001 - EOF + # cat << EOF | sudo tee /etc/apt/preferences.d/pin-to-rel + # Package: libllvm6.0 + # Pin: origin "azure.archive.ubuntu.com" + #Pin-Priority: 1001 + # EOF # echo_run sudo apt-fast update -qq echo_run sudo apt-fast update -qq || echo "failed, see bug #17343" From 49e403eff800d41f748295e9a509a7c744fbe8b1 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Fri, 12 Mar 2021 16:25:13 -0800 Subject: [PATCH 02/67] PRTEMP disable CI --- .builds/freebsd.yml | 31 ------- .builds/openbsd_0.yml | 34 ------- .builds/openbsd_1.yml | 34 ------- .github/workflows/ci_docs.yml | 141 ------------------------------ .github/workflows/ci_packages.yml | 86 ------------------ azure-pipelines.yml | 23 ----- 6 files changed, 349 deletions(-) delete mode 100644 .builds/freebsd.yml delete mode 100644 .builds/openbsd_0.yml delete mode 100644 .builds/openbsd_1.yml delete mode 100644 .github/workflows/ci_docs.yml delete mode 100644 .github/workflows/ci_packages.yml diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml deleted file mode 100644 index 6898a80fdc661..0000000000000 --- a/.builds/freebsd.yml +++ /dev/null @@ -1,31 +0,0 @@ -# see https://man.sr.ht/builds.sr.ht/compatibility.md#freebsd -image: freebsd/latest -packages: -- databases/sqlite3 -- devel/boehm-gc-threaded -- devel/pcre -- devel/sdl20 -- devel/sfml -- www/node -- devel/gmake -sources: -- https://github.com/nim-lang/Nim -environment: - CC: /usr/bin/clang -tasks: -- setup: | - cd Nim - git clone --depth 1 -q https://github.com/nim-lang/csources.git - gmake -C csources -j $(sysctl -n hw.ncpu) - bin/nim c --skipUserCfg --skipParentCfg koch - echo 'export PATH=$HOME/Nim/bin:$PATH' >> $HOME/.buildenv -- test: | - cd Nim - if ! ./koch runCI; then - nim c -r tools/ci_testresults.nim - exit 1 - fi -triggers: -- action: email - condition: failure - to: Andreas Rumpf diff --git a/.builds/openbsd_0.yml b/.builds/openbsd_0.yml deleted file mode 100644 index 146ad81657bcd..0000000000000 --- a/.builds/openbsd_0.yml +++ /dev/null @@ -1,34 +0,0 @@ -## do not edit directly; auto-generated by `nim r tools/ci_generate.nim` - -image: openbsd/latest -packages: -- gmake -- sqlite3 -- node -- boehm-gc -- pcre -- sfml -- sdl2 -- libffi -sources: -- https://github.com/nim-lang/Nim -environment: - NIM_TESTAMENT_BATCH: "0_2" - CC: /usr/bin/clang -tasks: -- setup: | - cd Nim - git clone --depth 1 -q https://github.com/nim-lang/csources.git - gmake -C csources -j $(sysctl -n hw.ncpuonline) - bin/nim c koch - echo 'export PATH=$HOME/Nim/bin:$PATH' >> $HOME/.buildenv -- test: | - cd Nim - if ! ./koch runCI; then - nim c -r tools/ci_testresults.nim - exit 1 - fi -triggers: -- action: email - condition: failure - to: Andreas Rumpf diff --git a/.builds/openbsd_1.yml b/.builds/openbsd_1.yml deleted file mode 100644 index ad373400835d2..0000000000000 --- a/.builds/openbsd_1.yml +++ /dev/null @@ -1,34 +0,0 @@ -## do not edit directly; auto-generated by `nim r tools/ci_generate.nim` - -image: openbsd/latest -packages: -- gmake -- sqlite3 -- node -- boehm-gc -- pcre -- sfml -- sdl2 -- libffi -sources: -- https://github.com/nim-lang/Nim -environment: - NIM_TESTAMENT_BATCH: "1_2" - CC: /usr/bin/clang -tasks: -- setup: | - cd Nim - git clone --depth 1 -q https://github.com/nim-lang/csources.git - gmake -C csources -j $(sysctl -n hw.ncpuonline) - bin/nim c koch - echo 'export PATH=$HOME/Nim/bin:$PATH' >> $HOME/.buildenv -- test: | - cd Nim - if ! ./koch runCI; then - nim c -r tools/ci_testresults.nim - exit 1 - fi -triggers: -- action: email - condition: failure - to: Andreas Rumpf diff --git a/.github/workflows/ci_docs.yml b/.github/workflows/ci_docs.yml deleted file mode 100644 index 22d425b103c18..0000000000000 --- a/.github/workflows/ci_docs.yml +++ /dev/null @@ -1,141 +0,0 @@ -name: Nim Docs CI -on: - push: - paths: - - 'compiler/docgen.nim' - - 'compiler/renderverbatim.nim' - - 'config/nimdoc.cfg' - - 'doc/**.rst' - - 'doc/nimdoc.css' - - 'lib/**.nim' - - 'nimdoc/testproject/expected/testproject.html' - - 'tools/dochack/dochack.nim' - - 'tools/kochdocs.nim' - - '.github/workflows/ci_docs.yml' - - 'koch.nim' - pull_request: - # Run only on changes on these files. - paths: - - 'compiler/docgen.nim' - - 'compiler/renderverbatim.nim' - - 'config/nimdoc.cfg' - - 'doc/**.rst' - - 'doc/nimdoc.css' - - 'lib/**.nim' - - 'nimdoc/testproject/expected/testproject.html' - - 'tools/dochack/dochack.nim' - - 'tools/kochdocs.nim' - - '.github/workflows/ci_docs.yml' - - 'koch.nim' - -jobs: - build: - if: | - !contains(format('{0} {1}', github.event.head_commit.message, github.event.pull_request.title), '[skip ci]') - strategy: - fail-fast: false - matrix: - target: [linux, windows, osx] - include: - - target: linux - os: ubuntu-18.04 - - target: windows - os: windows-2019 - - target: osx - os: macos-10.15 - - name: ${{ matrix.target }} - runs-on: ${{ matrix.os }} - - steps: - - name: 'Checkout' - uses: actions/checkout@v2 - - - name: 'Install build dependencies (macOS)' - if: runner.os == 'macOS' - run: brew install make - - - name: 'Install build dependencies (Windows)' - if: runner.os == 'Windows' - shell: bash - run: | - mkdir dist - curl -L https://nim-lang.org/download/mingw64.7z -o dist/mingw64.7z - curl -L https://nim-lang.org/download/dlls.zip -o dist/dlls.zip - 7z x dist/mingw64.7z -odist - 7z x dist/dlls.zip -obin - echo "${{ github.workspace }}/dist/mingw64/bin" >> "${GITHUB_PATH}" - - - name: 'Add build binaries to PATH' - shell: bash - run: echo "${{ github.workspace }}/bin" >> "${GITHUB_PATH}" - - - name: 'Get current csources version' - id: csources-version - shell: bash - run: | - sha=$(git ls-remote https://github.com/nim-lang/csources master | cut -f 1) - echo "::set-output name=sha::$sha" - - - name: 'Get prebuilt csources from cache' - id: csources-cache - uses: actions/cache@v1 - with: - path: bin - key: '${{ matrix.os }}-${{ steps.csources-version.outputs.sha }}' - - - name: 'Checkout csources' - if: steps.csources-cache.outputs.cache-hit != 'true' - uses: actions/checkout@v2 - with: - repository: nim-lang/csources - path: csources - - - name: 'Build 1-stage compiler from csources' - shell: bash - run: | - ext= - [[ '${{ runner.os }}' == 'Windows' ]] && ext=.exe - if [[ ! -x bin/nim-csources$ext ]]; then - ncpu= - case '${{ runner.os }}' in - 'Linux') - ncpu=$(nproc) - ;; - 'macOS') - ncpu=$(sysctl -n hw.ncpu) - ;; - 'Windows') - ncpu=$NUMBER_OF_PROCESSORS - ;; - esac - [[ -z "$ncpu" || $ncpu -le 0 ]] && ncpu=1 - - make -C csources -j $ncpu CC=gcc - cp bin/nim{,-csources}$ext - else - echo 'Cache hit, using prebuilt csources' - cp bin/nim{-csources,}$ext - fi - - - name: 'Build koch' - shell: bash - run: nim c koch - - - name: 'Build the real compiler' - shell: bash - run: ./koch boot -d:release - - - name: 'Build documentation' - shell: bash - run: ./koch doc --git.commit:devel - - - name: 'Publish documentation to Github Pages' - if: | - github.event_name == 'push' && github.ref == 'refs/heads/devel' && - matrix.target == 'linux' - uses: crazy-max/ghaction-github-pages@v1 - with: - build_dir: doc/html - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/ci_packages.yml b/.github/workflows/ci_packages.yml deleted file mode 100644 index dd42db0c46198..0000000000000 --- a/.github/workflows/ci_packages.yml +++ /dev/null @@ -1,86 +0,0 @@ -name: Packages CI -on: [push, pull_request] - -jobs: - build: - if: | - !contains(format('{0} {1}', github.event.head_commit.message, github.event.pull_request.title), '[skip ci]') - strategy: - fail-fast: false - matrix: - os: [ubuntu-18.04, macos-10.15] - cpu: [amd64] - batch: ["0_3", "1_3", "2_3"] # list of `index_num` - name: '${{ matrix.os }} (batch: ${{ matrix.batch }})' - runs-on: ${{ matrix.os }} - env: - NIM_TEST_PACKAGES: "1" - NIM_TESTAMENT_BATCH: ${{ matrix.batch }} - steps: - - name: 'Checkout' - uses: actions/checkout@v2 - - name: 'Checkout csources' - uses: actions/checkout@v2 - with: - repository: nim-lang/csources - path: csources - - - name: 'Install node.js 12.x' - uses: actions/setup-node@v1 - with: - node-version: '12.x' - - name: 'Install dependencies (Linux amd64)' - if: runner.os == 'Linux' && matrix.cpu == 'amd64' - run: | - sudo apt-fast update -qq - DEBIAN_FRONTEND='noninteractive' \ - sudo apt-fast install --no-install-recommends -yq \ - libcurl4-openssl-dev libgc-dev libsdl1.2-dev libsfml-dev \ - valgrind libc6-dbg libblas-dev xorg-dev - - name: 'Install dependencies (macOS)' - if: runner.os == 'macOS' - run: brew install boehmgc make sfml gtk+3 - - name: 'Install dependencies (Windows)' - if: runner.os == 'Windows' - shell: bash - run: | - mkdir dist - curl -L https://nim-lang.org/download/mingw64.7z -o dist/mingw64.7z - curl -L https://nim-lang.org/download/dlls.zip -o dist/dlls.zip - 7z x dist/mingw64.7z -odist - 7z x dist/dlls.zip -obin - echo "${{ github.workspace }}/dist/mingw64/bin" >> "${GITHUB_PATH}" - - - name: 'Add build binaries to PATH' - shell: bash - run: echo "${{ github.workspace }}/bin" >> "${GITHUB_PATH}" - - - name: 'Build csources' - shell: bash - run: | - ncpu= - case '${{ runner.os }}' in - 'Linux') - ncpu=$(nproc) - ;; - 'macOS') - ncpu=$(sysctl -n hw.ncpu) - ;; - 'Windows') - ncpu=$NUMBER_OF_PROCESSORS - ;; - esac - [[ -z "$ncpu" || $ncpu -le 0 ]] && ncpu=1 - - make -C csources -j $ncpu CC=gcc ucpu='${{ matrix.cpu }}' - - name: 'Build koch' - shell: bash - run: nim c koch - - name: 'Run CI' - shell: bash - run: ./koch runCI - - - name: 'Show failed tests' - if: failure() - shell: bash - run: nim c -r tools/ci_testresults.nim diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d211785041baa..f021b70759243 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -14,34 +14,11 @@ jobs: strategy: matrix: - Linux_amd64: - vmImage: 'ubuntu-16.04' - CPU: amd64 Linux_i386: # bug #17325: fails on 'ubuntu-16.04' because it now errors with: # g++-multilib : Depends: gcc-multilib (>= 4:5.3.1-1ubuntu1) but it is not going to be installed vmImage: 'ubuntu-16.04' CPU: i386 - OSX_amd64: - vmImage: 'macOS-10.15' - CPU: amd64 - OSX_amd64_cpp: - vmImage: 'macOS-10.15' - CPU: amd64 - NIM_COMPILE_TO_CPP: true - Windows_amd64_batch0_3: - vmImage: 'windows-2019' - CPU: amd64 - # see also: `NIM_TEST_PACKAGES` - NIM_TESTAMENT_BATCH: "0_3" - Windows_amd64_batch1_3: - vmImage: 'windows-2019' - CPU: amd64 - NIM_TESTAMENT_BATCH: "1_3" - Windows_amd64_batch2_3: - vmImage: 'windows-2019' - CPU: amd64 - NIM_TESTAMENT_BATCH: "2_3" pool: vmImage: $(vmImage) From 3203ee3e1d58271b6b318e350f9e3e556a721e4c Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Fri, 12 Mar 2021 16:29:21 -0800 Subject: [PATCH 03/67] _ --- azure-pipelines.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f021b70759243..fea6c0b8d8636 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,7 +17,7 @@ jobs: Linux_i386: # bug #17325: fails on 'ubuntu-16.04' because it now errors with: # g++-multilib : Depends: gcc-multilib (>= 4:5.3.1-1ubuntu1) but it is not going to be installed - vmImage: 'ubuntu-16.04' + vmImage: 'ubuntu-18.04' CPU: i386 pool: @@ -31,8 +31,9 @@ jobs: displayName: 'Disable auto conversion to CRLF by git (Windows-only)' condition: eq(variables['Agent.OS'], 'Windows_NT') - - checkout: self - fetchDepth: 1 + # - checkout: self + # fetchDepth: 1 + - checkout: none - bash: git clone --depth 1 https://github.com/nim-lang/csources displayName: 'Checkout Nim csources' From 3596f141ee7bbb59eac0560ff21db2b05d37042b Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Fri, 12 Mar 2021 16:32:34 -0800 Subject: [PATCH 04/67] _ --- azure-pipelines.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index fea6c0b8d8636..0044c88ff43e2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -56,6 +56,7 @@ jobs: - bash: | set -e . ci/funs.sh + echo_run echo "v1" echo_run sudo dpkg --add-architecture i386 # Downgrade llvm: # - llvm has to be downgraded to have 32bit version installed for sfml. @@ -67,11 +68,14 @@ jobs: # EOF # echo_run sudo apt-fast update -qq - echo_run sudo apt-fast update -qq || echo "failed, see bug #17343" + echo_run sudo apt-get update # `:i386` (e.g. in `libffi-dev:i386`) is needed otherwise you may get: # `could not load: libffi.so` during dynamic loading. DEBIAN_FRONTEND='noninteractive' \ - echo_run sudo apt-fast install --no-install-recommends --allow-downgrades -yq \ + echo_run sudo apt-get install -y gcc-multilib + + DEBIAN_FRONTEND='noninteractive' \ + echo_run sudo apt-get install --no-install-recommends --allow-downgrades -yq \ g++-multilib gcc-multilib libcurl4-openssl-dev:i386 libgc-dev:i386 \ libsdl1.2-dev:i386 libsfml-dev:i386 libglib2.0-dev:i386 libffi-dev:i386 From 8012bcfb24ef9cd6ebf9c5a4cf43a5bb561da293 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Fri, 12 Mar 2021 16:48:44 -0800 Subject: [PATCH 05/67] _ --- azure-pipelines.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0044c88ff43e2..eb06760277e30 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -55,7 +55,14 @@ jobs: - bash: | set -e - . ci/funs.sh + # . ci/funs.sh + + echo_run () { + echo "" + echo "$@" + "$@" + } + echo_run echo "v1" echo_run sudo dpkg --add-architecture i386 # Downgrade llvm: From 898e9c643f2d4c6a946be44ba9e0fbd5a6cce8c0 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Fri, 12 Mar 2021 16:55:34 -0800 Subject: [PATCH 06/67] _ --- azure-pipelines.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index eb06760277e30..e93bb315376de 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -63,7 +63,7 @@ jobs: "$@" } - echo_run echo "v1" + echo_run echo "v2" echo_run sudo dpkg --add-architecture i386 # Downgrade llvm: # - llvm has to be downgraded to have 32bit version installed for sfml. @@ -81,10 +81,13 @@ jobs: DEBIAN_FRONTEND='noninteractive' \ echo_run sudo apt-get install -y gcc-multilib + # echo_run sudo apt-get install --no-install-recommends --allow-downgrades -yq + DEBIAN_FRONTEND='noninteractive' \ - echo_run sudo apt-get install --no-install-recommends --allow-downgrades -yq \ - g++-multilib gcc-multilib libcurl4-openssl-dev:i386 libgc-dev:i386 \ + echo_run sudo apt-get install -yq \ + g++-multilib gcc-multilib libgc-dev:i386 \ libsdl1.2-dev:i386 libsfml-dev:i386 libglib2.0-dev:i386 libffi-dev:i386 + # libcurl4-openssl-dev:i386 cat << EOF > bin/gcc #!/bin/bash From bf9fa8da6669d386c29e4ff17a41497424f0d591 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Fri, 12 Mar 2021 17:01:19 -0800 Subject: [PATCH 07/67] _ --- azure-pipelines.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e93bb315376de..bc2353b001613 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -89,18 +89,23 @@ jobs: libsdl1.2-dev:i386 libsfml-dev:i386 libglib2.0-dev:i386 libffi-dev:i386 # libcurl4-openssl-dev:i386 + echo_run which gcc + cat << EOF > bin/gcc #!/bin/bash exec $(which gcc) -m32 "\$@" EOF + echo_run which g++ + cat << EOF > bin/g++ #!/bin/bash exec $(which g++) -m32 "\$@" EOF + echo_run ls bin echo_run chmod 755 bin/gcc echo_run chmod 755 bin/g++ From d6d0929ba70e8235cb5d8d5f78ae5543bab5229d Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Fri, 12 Mar 2021 17:02:13 -0800 Subject: [PATCH 08/67] _ --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bc2353b001613..48842f58e5fd9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -90,6 +90,7 @@ jobs: # libcurl4-openssl-dev:i386 echo_run which gcc + echo_run which -a gcc cat << EOF > bin/gcc #!/bin/bash From 7bfd2b35dc9481f22c9ee47b213d3aa9f9914c2a Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Fri, 12 Mar 2021 17:18:06 -0800 Subject: [PATCH 09/67] _ --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 48842f58e5fd9..18125aea4f07b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -91,6 +91,7 @@ jobs: echo_run which gcc echo_run which -a gcc + echo_run mkdir -b bin # only bc ... cat << EOF > bin/gcc #!/bin/bash From 8dace223e4bb46ea46740c2422b17bf89ef2a956 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Fri, 12 Mar 2021 17:27:25 -0800 Subject: [PATCH 10/67] _ --- azure-pipelines.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 18125aea4f07b..06b989ed1305e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -31,9 +31,9 @@ jobs: displayName: 'Disable auto conversion to CRLF by git (Windows-only)' condition: eq(variables['Agent.OS'], 'Windows_NT') - # - checkout: self - # fetchDepth: 1 - - checkout: none + - checkout: self + fetchDepth: 1 + # - checkout: none - bash: git clone --depth 1 https://github.com/nim-lang/csources displayName: 'Checkout Nim csources' @@ -91,7 +91,6 @@ jobs: echo_run which gcc echo_run which -a gcc - echo_run mkdir -b bin # only bc ... cat << EOF > bin/gcc #!/bin/bash @@ -107,7 +106,6 @@ jobs: exec $(which g++) -m32 "\$@" EOF - echo_run ls bin echo_run chmod 755 bin/gcc echo_run chmod 755 bin/g++ From f48692913f2bf6eac356db4248cb784dd2ea4c6f Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Fri, 12 Mar 2021 17:51:16 -0800 Subject: [PATCH 11/67] _ --- azure-pipelines.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 06b989ed1305e..b6bfff28fcc55 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -63,7 +63,7 @@ jobs: "$@" } - echo_run echo "v2" + echo_run echo "v3" echo_run sudo dpkg --add-architecture i386 # Downgrade llvm: # - llvm has to be downgraded to have 32bit version installed for sfml. @@ -87,22 +87,20 @@ jobs: echo_run sudo apt-get install -yq \ g++-multilib gcc-multilib libgc-dev:i386 \ libsdl1.2-dev:i386 libsfml-dev:i386 libglib2.0-dev:i386 libffi-dev:i386 - # libcurl4-openssl-dev:i386 - echo_run which gcc - echo_run which -a gcc + DEBIAN_FRONTEND='noninteractive' \ + echo_run sudo apt-get install -yq \ + libssl-dev:i386 + + # libcurl4-openssl-dev:i386 cat << EOF > bin/gcc #!/bin/bash - exec $(which gcc) -m32 "\$@" EOF - echo_run which g++ - cat << EOF > bin/g++ #!/bin/bash - exec $(which g++) -m32 "\$@" EOF From 693cc4bc177a75d3a61ef3c177a6d010c67b60de Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Fri, 12 Mar 2021 18:09:46 -0800 Subject: [PATCH 12/67] _ --- azure-pipelines.yml | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b6bfff28fcc55..d2ec8ce72fe54 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,7 +17,8 @@ jobs: Linux_i386: # bug #17325: fails on 'ubuntu-16.04' because it now errors with: # g++-multilib : Depends: gcc-multilib (>= 4:5.3.1-1ubuntu1) but it is not going to be installed - vmImage: 'ubuntu-18.04' + # vmImage: 'ubuntu-18.04' + vmImage: 'ubuntu-16.04' CPU: i386 pool: @@ -63,6 +64,8 @@ jobs: "$@" } + export DEBIAN_FRONTEND='noninteractive' + echo_run echo "v3" echo_run sudo dpkg --add-architecture i386 # Downgrade llvm: @@ -78,19 +81,20 @@ jobs: echo_run sudo apt-get update # `:i386` (e.g. in `libffi-dev:i386`) is needed otherwise you may get: # `could not load: libffi.so` during dynamic loading. - DEBIAN_FRONTEND='noninteractive' \ - echo_run sudo apt-get install -y gcc-multilib + + echo_run sudo apt-get install -y gcc-multilib # echo_run sudo apt-get install --no-install-recommends --allow-downgrades -yq - DEBIAN_FRONTEND='noninteractive' \ - echo_run sudo apt-get install -yq \ - g++-multilib gcc-multilib libgc-dev:i386 \ - libsdl1.2-dev:i386 libsfml-dev:i386 libglib2.0-dev:i386 libffi-dev:i386 + echo_run sudo apt-get install -yq \ + g++-multilib gcc-multilib libgc-dev:i386 \ + libsdl1.2-dev:i386 libsfml-dev:i386 libglib2.0-dev:i386 libffi-dev:i386 - DEBIAN_FRONTEND='noninteractive' \ - echo_run sudo apt-get install -yq \ - libssl-dev:i386 + # echo_run apt-get install -y --allow-downgrades libssl1.0.0/trusty libssl-dev/trusty openssl/trusty + echo_run sudo apt-get install -y --allow-downgrades libssl/xenial libssl-dev/xenial openssl/xenial + + echo_run sudo apt-get install -yq \ + libssl-dev:i386 # libcurl4-openssl-dev:i386 From 9a488d6f4ac4b6d4a751d9009398acecb2ece968 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Fri, 12 Mar 2021 18:17:40 -0800 Subject: [PATCH 13/67] _ --- azure-pipelines.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d2ec8ce72fe54..60ec09c5cb024 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,8 +17,7 @@ jobs: Linux_i386: # bug #17325: fails on 'ubuntu-16.04' because it now errors with: # g++-multilib : Depends: gcc-multilib (>= 4:5.3.1-1ubuntu1) but it is not going to be installed - # vmImage: 'ubuntu-18.04' - vmImage: 'ubuntu-16.04' + vmImage: 'ubuntu-18.04' CPU: i386 pool: @@ -91,12 +90,13 @@ jobs: libsdl1.2-dev:i386 libsfml-dev:i386 libglib2.0-dev:i386 libffi-dev:i386 # echo_run apt-get install -y --allow-downgrades libssl1.0.0/trusty libssl-dev/trusty openssl/trusty - echo_run sudo apt-get install -y --allow-downgrades libssl/xenial libssl-dev/xenial openssl/xenial + # echo_run sudo apt-get install -y --allow-downgrades libssl/xenial libssl-dev/xenial openssl/xenial - echo_run sudo apt-get install -yq \ - libssl-dev:i386 + echo_run sudo apt-get install -y --allow-downgrades libssl libssl-dev openssl + + echo_run sudo apt-get install -yq --allow-downgrades libssl-dev:i386 - # libcurl4-openssl-dev:i386 + # libcurl4-openssl-dev:i386 cat << EOF > bin/gcc #!/bin/bash From 7d4276de07c33b1db6e181b9a9063093d7c9396e Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Fri, 12 Mar 2021 18:17:58 -0800 Subject: [PATCH 14/67] _ --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 60ec09c5cb024..43213110c3f63 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -94,7 +94,7 @@ jobs: echo_run sudo apt-get install -y --allow-downgrades libssl libssl-dev openssl - echo_run sudo apt-get install -yq --allow-downgrades libssl-dev:i386 + echo_run sudo apt-get install -y --allow-downgrades libssl-dev:i386 # libcurl4-openssl-dev:i386 From 0eb7cd621848484617815b936dffe34ef34a1ba7 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Fri, 12 Mar 2021 18:29:04 -0800 Subject: [PATCH 15/67] _ --- azure-pipelines.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 43213110c3f63..501126e6ae56c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -92,7 +92,8 @@ jobs: # echo_run apt-get install -y --allow-downgrades libssl1.0.0/trusty libssl-dev/trusty openssl/trusty # echo_run sudo apt-get install -y --allow-downgrades libssl/xenial libssl-dev/xenial openssl/xenial - echo_run sudo apt-get install -y --allow-downgrades libssl libssl-dev openssl + # echo_run sudo apt-get install -y --allow-downgrades libssl libssl-dev openssl + echo_run sudo apt-get install -y --allow-downgrades libssl-dev echo_run sudo apt-get install -y --allow-downgrades libssl-dev:i386 From e0e51df07c9bd61e5296518d56ef12c274f97990 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Fri, 12 Mar 2021 18:48:38 -0800 Subject: [PATCH 16/67] _ --- azure-pipelines.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 501126e6ae56c..d72d6b0815680 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,7 +17,8 @@ jobs: Linux_i386: # bug #17325: fails on 'ubuntu-16.04' because it now errors with: # g++-multilib : Depends: gcc-multilib (>= 4:5.3.1-1ubuntu1) but it is not going to be installed - vmImage: 'ubuntu-18.04' + # vmImage: 'ubuntu-18.04' + vmImage: 'ubuntu-20.04' CPU: i386 pool: @@ -93,7 +94,7 @@ jobs: # echo_run sudo apt-get install -y --allow-downgrades libssl/xenial libssl-dev/xenial openssl/xenial # echo_run sudo apt-get install -y --allow-downgrades libssl libssl-dev openssl - echo_run sudo apt-get install -y --allow-downgrades libssl-dev + # echo_run sudo apt-get install -y --allow-downgrades libssl-dev echo_run sudo apt-get install -y --allow-downgrades libssl-dev:i386 From 2911e2aa4b16fda85c9f1947714242625797cf31 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Fri, 12 Mar 2021 18:51:35 -0800 Subject: [PATCH 17/67] _ --- azure-pipelines.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d72d6b0815680..154cbba3f3004 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -88,7 +88,8 @@ jobs: echo_run sudo apt-get install -yq \ g++-multilib gcc-multilib libgc-dev:i386 \ - libsdl1.2-dev:i386 libsfml-dev:i386 libglib2.0-dev:i386 libffi-dev:i386 + libsdl1.2-dev:i386 libglib2.0-dev:i386 libffi-dev:i386 + # libsfml-dev:i386 # echo_run apt-get install -y --allow-downgrades libssl1.0.0/trusty libssl-dev/trusty openssl/trusty # echo_run sudo apt-get install -y --allow-downgrades libssl/xenial libssl-dev/xenial openssl/xenial From 35b8f710cdeaa51c585c576cbbad8a721b8fe49b Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Fri, 12 Mar 2021 21:29:47 -0800 Subject: [PATCH 18/67] _ --- azure-pipelines.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 154cbba3f3004..9f70c93e84fd2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -96,9 +96,14 @@ jobs: # echo_run sudo apt-get install -y --allow-downgrades libssl libssl-dev openssl # echo_run sudo apt-get install -y --allow-downgrades libssl-dev + echo_run sudo apt-get install -y --allow-downgrades libssl-dev:i386 + echo_run sudo apt-get install -y --allow-downgrades libssl-dev echo_run sudo apt-get install -y --allow-downgrades libssl-dev:i386 + echo_run sudo apt-get install -y --allow-downgrades libcurl4-openssl-dev + echo_run sudo apt-get install -y --allow-downgrades libcurl4-openssl-dev:i386 + # libcurl4-openssl-dev:i386 cat << EOF > bin/gcc From 06ef1e394491248a2416872395a425a295ee0146 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Fri, 12 Mar 2021 23:07:00 -0800 Subject: [PATCH 19/67] _ --- azure-pipelines.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9f70c93e84fd2..709250b9eae71 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -66,16 +66,15 @@ jobs: export DEBIAN_FRONTEND='noninteractive' - echo_run echo "v3" echo_run sudo dpkg --add-architecture i386 # Downgrade llvm: # - llvm has to be downgraded to have 32bit version installed for sfml. - # cat << EOF | sudo tee /etc/apt/preferences.d/pin-to-rel - # Package: libllvm6.0 - # Pin: origin "azure.archive.ubuntu.com" - #Pin-Priority: 1001 - # EOF + cat << EOF | sudo tee /etc/apt/preferences.d/pin-to-rel + Package: libllvm6.0 + Pin: origin "azure.archive.ubuntu.com" + Pin-Priority: 1001 + EOF # echo_run sudo apt-fast update -qq echo_run sudo apt-get update From 56ec52e4106a4a2d4fd9a0fd5e2af9ea0a06772a Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Sat, 13 Mar 2021 21:30:57 -0800 Subject: [PATCH 20/67] _ --- azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 709250b9eae71..ec3a7992c78a6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -95,6 +95,8 @@ jobs: # echo_run sudo apt-get install -y --allow-downgrades libssl libssl-dev openssl # echo_run sudo apt-get install -y --allow-downgrades libssl-dev + + #PRTEMP echo_run sudo apt-get install -y --allow-downgrades libssl-dev:i386 echo_run sudo apt-get install -y --allow-downgrades libssl-dev From 9fc067f9e6e56f032c1ffc65d336ca688067c5b1 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Mon, 15 Mar 2021 11:18:45 -0700 Subject: [PATCH 21/67] PRTEMP2 --- azure-pipelines.yml | 51 ++++++++++++--------------------------------- 1 file changed, 13 insertions(+), 38 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ec3a7992c78a6..7292a908411bd 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,8 +17,7 @@ jobs: Linux_i386: # bug #17325: fails on 'ubuntu-16.04' because it now errors with: # g++-multilib : Depends: gcc-multilib (>= 4:5.3.1-1ubuntu1) but it is not going to be installed - # vmImage: 'ubuntu-18.04' - vmImage: 'ubuntu-20.04' + vmImage: 'ubuntu-18.04' CPU: i386 pool: @@ -34,7 +33,6 @@ jobs: - checkout: self fetchDepth: 1 - # - checkout: none - bash: git clone --depth 1 https://github.com/nim-lang/csources displayName: 'Checkout Nim csources' @@ -56,16 +54,7 @@ jobs: - bash: | set -e - # . ci/funs.sh - - echo_run () { - echo "" - echo "$@" - "$@" - } - - export DEBIAN_FRONTEND='noninteractive' - + . ci/funs.sh echo_run sudo dpkg --add-architecture i386 # Downgrade llvm: # - llvm has to be downgraded to have 32bit version installed for sfml. @@ -77,43 +66,29 @@ jobs: EOF # echo_run sudo apt-fast update -qq - echo_run sudo apt-get update + echo_run sudo apt-fast update -qq || echo "failed, see bug #17343" # `:i386` (e.g. in `libffi-dev:i386`) is needed otherwise you may get: # `could not load: libffi.so` during dynamic loading. - echo_run sudo apt-get install -y gcc-multilib - - # echo_run sudo apt-get install --no-install-recommends --allow-downgrades -yq - - echo_run sudo apt-get install -yq \ - g++-multilib gcc-multilib libgc-dev:i386 \ - libsdl1.2-dev:i386 libglib2.0-dev:i386 libffi-dev:i386 - # libsfml-dev:i386 - - # echo_run apt-get install -y --allow-downgrades libssl1.0.0/trusty libssl-dev/trusty openssl/trusty - # echo_run sudo apt-get install -y --allow-downgrades libssl/xenial libssl-dev/xenial openssl/xenial - - # echo_run sudo apt-get install -y --allow-downgrades libssl libssl-dev openssl - # echo_run sudo apt-get install -y --allow-downgrades libssl-dev - - #PRTEMP - echo_run sudo apt-get install -y --allow-downgrades libssl-dev:i386 - - echo_run sudo apt-get install -y --allow-downgrades libssl-dev - echo_run sudo apt-get install -y --allow-downgrades libssl-dev:i386 - - echo_run sudo apt-get install -y --allow-downgrades libcurl4-openssl-dev - echo_run sudo apt-get install -y --allow-downgrades libcurl4-openssl-dev:i386 + DEBIAN_FRONTEND='noninteractive' \ + echo_run sudo apt-fast install --no-install-recommends --allow-downgrades -yq \ + g++-multilib gcc-multilib libcurl4-openssl-dev libcurl4-openssl-dev:i386 libgc-dev libgc-dev:i386 \ + libsdl1.2-dev libsdl1.2-dev:i386 libsfml-dev libsfml-dev:i386 libglib2.0-dev libglib2.0-dev:i386 libffi-dev libffi-dev:i386 - # libcurl4-openssl-dev:i386 + #DEBIAN_FRONTEND='noninteractive' \ + # echo_run sudo apt-fast install --no-install-recommends --allow-downgrades -yq \ + # g++-multilib gcc-multilib libcurl4-openssl-dev:i386 libgc-dev:i386 \ + # libsdl1.2-dev:i386 libsfml-dev:i386 libglib2.0-dev:i386 libffi-dev:i386 cat << EOF > bin/gcc #!/bin/bash + exec $(which gcc) -m32 "\$@" EOF cat << EOF > bin/g++ #!/bin/bash + exec $(which g++) -m32 "\$@" EOF From 7b1c34cc9e76918a73f585878760efb40b88168d Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Mon, 15 Mar 2021 12:32:42 -0700 Subject: [PATCH 22/67] _ --- azure-pipelines.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7292a908411bd..1316f4e317dda 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -56,6 +56,8 @@ jobs: set -e . ci/funs.sh echo_run sudo dpkg --add-architecture i386 + export DEBIAN_FRONTEND='noninteractive' + # Downgrade llvm: # - llvm has to be downgraded to have 32bit version installed for sfml. @@ -66,12 +68,14 @@ jobs: EOF # echo_run sudo apt-fast update -qq - echo_run sudo apt-fast update -qq || echo "failed, see bug #17343" + echo_run sudo apt-fast update || echo "failed, see bug #17343" + # echo_run sudo apt-fast update -qq || echo "failed, see bug #17343" # `:i386` (e.g. in `libffi-dev:i386`) is needed otherwise you may get: # `could not load: libffi.so` during dynamic loading. - DEBIAN_FRONTEND='noninteractive' \ - echo_run sudo apt-fast install --no-install-recommends --allow-downgrades -yq \ + echo_run sudo apt-fast install --no-install-recommends --allow-downgrades -y gcc-multilib + + echo_run sudo apt-fast install --no-install-recommends --allow-downgrades -y \ g++-multilib gcc-multilib libcurl4-openssl-dev libcurl4-openssl-dev:i386 libgc-dev libgc-dev:i386 \ libsdl1.2-dev libsdl1.2-dev:i386 libsfml-dev libsfml-dev:i386 libglib2.0-dev libglib2.0-dev:i386 libffi-dev libffi-dev:i386 From 24c165add6e4190e49bdc764c0c27fdaba5696ce Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Mon, 15 Mar 2021 12:36:19 -0700 Subject: [PATCH 23/67] _ --- azure-pipelines.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1316f4e317dda..9e2b0e3815d85 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -73,10 +73,11 @@ jobs: # `:i386` (e.g. in `libffi-dev:i386`) is needed otherwise you may get: # `could not load: libffi.so` during dynamic loading. - echo_run sudo apt-fast install --no-install-recommends --allow-downgrades -y gcc-multilib + echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y gcc-multilib + echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y g++-multilib echo_run sudo apt-fast install --no-install-recommends --allow-downgrades -y \ - g++-multilib gcc-multilib libcurl4-openssl-dev libcurl4-openssl-dev:i386 libgc-dev libgc-dev:i386 \ + libcurl4-openssl-dev libcurl4-openssl-dev:i386 libgc-dev libgc-dev:i386 \ libsdl1.2-dev libsdl1.2-dev:i386 libsfml-dev libsfml-dev:i386 libglib2.0-dev libglib2.0-dev:i386 libffi-dev libffi-dev:i386 #DEBIAN_FRONTEND='noninteractive' \ From 530f552930218df958725b70488a9e79ebcef151 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Mon, 15 Mar 2021 12:40:57 -0700 Subject: [PATCH 24/67] _ --- azure-pipelines.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9e2b0e3815d85..ad85d32884417 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -76,9 +76,16 @@ jobs: echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y gcc-multilib echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y g++-multilib - echo_run sudo apt-fast install --no-install-recommends --allow-downgrades -y \ - libcurl4-openssl-dev libcurl4-openssl-dev:i386 libgc-dev libgc-dev:i386 \ - libsdl1.2-dev libsdl1.2-dev:i386 libsfml-dev libsfml-dev:i386 libglib2.0-dev libglib2.0-dev:i386 libffi-dev libffi-dev:i386 + echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libcurl4-openssl-dev libcurl4-openssl-dev:i386 + echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libgc-dev libgc-dev:i386 + echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libsdl1.2-dev libsdl1.2-dev:i386 + echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libsfml-dev libsfml-dev:i386 + echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libglib2.0-dev libglib2.0-dev:i386 + echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libffi-dev libffi-dev:i386 + + # echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y \ + # libcurl4-openssl-dev libcurl4-openssl-dev:i386 libgc-dev libgc-dev:i386 \ + # libsdl1.2-dev libsdl1.2-dev:i386 libsfml-dev libsfml-dev:i386 libglib2.0-dev libglib2.0-dev:i386 libffi-dev libffi-dev:i386 #DEBIAN_FRONTEND='noninteractive' \ # echo_run sudo apt-fast install --no-install-recommends --allow-downgrades -yq \ From 2c481b04aa0a567f138fc9daeaa5c36816e2f939 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Mon, 15 Mar 2021 12:49:42 -0700 Subject: [PATCH 25/67] _ --- azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ad85d32884417..b3cc35d8fe130 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -76,6 +76,8 @@ jobs: echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y gcc-multilib echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y g++-multilib + # libcurl4-openssl-dev:i386 : Depends: libcurl4:i386 (= 7.58.0-2ubuntu3.12) but it is not going to be installed + echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libcurl4 libcurl4:i386 echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libcurl4-openssl-dev libcurl4-openssl-dev:i386 echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libgc-dev libgc-dev:i386 echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libsdl1.2-dev libsdl1.2-dev:i386 From 1d85a7a5312275203e9960039fac9ffd21d9d0d1 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Mon, 15 Mar 2021 12:53:50 -0700 Subject: [PATCH 26/67] _ --- azure-pipelines.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b3cc35d8fe130..a110b53ae8503 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -77,8 +77,12 @@ jobs: echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y g++-multilib # libcurl4-openssl-dev:i386 : Depends: libcurl4:i386 (= 7.58.0-2ubuntu3.12) but it is not going to be installed - echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libcurl4 libcurl4:i386 - echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libcurl4-openssl-dev libcurl4-openssl-dev:i386 + # libcurl4:i386 : Depends: libssl1.1:i386 (>= 1.1.1) but it is not going to be installed + echo_run sudo apt-get install --allow-downgrades -y libcurl4 libcurl4:i386 + echo_run sudo apt-get install --allow-downgrades -y libcurl4-openssl-dev libcurl4-openssl-dev:i386 + # echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libcurl4 libcurl4:i386 + # echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libcurl4-openssl-dev libcurl4-openssl-dev:i386 + echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libgc-dev libgc-dev:i386 echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libsdl1.2-dev libsdl1.2-dev:i386 echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libsfml-dev libsfml-dev:i386 From 7619493cb29673e21a67ac16231fd2839f1e70cf Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Mon, 15 Mar 2021 13:16:03 -0700 Subject: [PATCH 27/67] _ --- azure-pipelines.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a110b53ae8503..5a3d66e63a66a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -78,10 +78,15 @@ jobs: # libcurl4-openssl-dev:i386 : Depends: libcurl4:i386 (= 7.58.0-2ubuntu3.12) but it is not going to be installed # libcurl4:i386 : Depends: libssl1.1:i386 (>= 1.1.1) but it is not going to be installed - echo_run sudo apt-get install --allow-downgrades -y libcurl4 libcurl4:i386 - echo_run sudo apt-get install --allow-downgrades -y libcurl4-openssl-dev libcurl4-openssl-dev:i386 - # echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libcurl4 libcurl4:i386 - # echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libcurl4-openssl-dev libcurl4-openssl-dev:i386 + #echo_run sudo apt-get install --allow-downgrades -y libcurl4 libcurl4:i386 + #echo_run sudo apt-get install --allow-downgrades -y libcurl4-openssl-dev libcurl4-openssl-dev:i386 + + # libcurl4:i386 : Depends: libssl1.1:i386 (>= 1.1.1) but it is not going to be installed + + echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libssl1.1 libssl1.1:i386 + + echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libcurl4 libcurl4:i386 + echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libcurl4-openssl-dev libcurl4-openssl-dev:i386 echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libgc-dev libgc-dev:i386 echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libsdl1.2-dev libsdl1.2-dev:i386 From 5b36899bb11bffdf3fc1f548314d007223f939f6 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Mon, 15 Mar 2021 13:35:50 -0700 Subject: [PATCH 28/67] try removing manual pinning --- azure-pipelines.yml | 48 +++++---------------------------------------- 1 file changed, 5 insertions(+), 43 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5a3d66e63a66a..b8afb45023849 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -56,52 +56,14 @@ jobs: set -e . ci/funs.sh echo_run sudo dpkg --add-architecture i386 - export DEBIAN_FRONTEND='noninteractive' - - # Downgrade llvm: - # - llvm has to be downgraded to have 32bit version installed for sfml. - - cat << EOF | sudo tee /etc/apt/preferences.d/pin-to-rel - Package: libllvm6.0 - Pin: origin "azure.archive.ubuntu.com" - Pin-Priority: 1001 - EOF - # echo_run sudo apt-fast update -qq - echo_run sudo apt-fast update || echo "failed, see bug #17343" - # echo_run sudo apt-fast update -qq || echo "failed, see bug #17343" + echo_run sudo apt-fast update -qq || echo "failed, see bug #17343" # `:i386` (e.g. in `libffi-dev:i386`) is needed otherwise you may get: # `could not load: libffi.so` during dynamic loading. - - echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y gcc-multilib - echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y g++-multilib - - # libcurl4-openssl-dev:i386 : Depends: libcurl4:i386 (= 7.58.0-2ubuntu3.12) but it is not going to be installed - # libcurl4:i386 : Depends: libssl1.1:i386 (>= 1.1.1) but it is not going to be installed - #echo_run sudo apt-get install --allow-downgrades -y libcurl4 libcurl4:i386 - #echo_run sudo apt-get install --allow-downgrades -y libcurl4-openssl-dev libcurl4-openssl-dev:i386 - - # libcurl4:i386 : Depends: libssl1.1:i386 (>= 1.1.1) but it is not going to be installed - - echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libssl1.1 libssl1.1:i386 - - echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libcurl4 libcurl4:i386 - echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libcurl4-openssl-dev libcurl4-openssl-dev:i386 - - echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libgc-dev libgc-dev:i386 - echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libsdl1.2-dev libsdl1.2-dev:i386 - echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libsfml-dev libsfml-dev:i386 - echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libglib2.0-dev libglib2.0-dev:i386 - echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y libffi-dev libffi-dev:i386 - - # echo_run sudo apt-get install --no-install-recommends --allow-downgrades -y \ - # libcurl4-openssl-dev libcurl4-openssl-dev:i386 libgc-dev libgc-dev:i386 \ - # libsdl1.2-dev libsdl1.2-dev:i386 libsfml-dev libsfml-dev:i386 libglib2.0-dev libglib2.0-dev:i386 libffi-dev libffi-dev:i386 - - #DEBIAN_FRONTEND='noninteractive' \ - # echo_run sudo apt-fast install --no-install-recommends --allow-downgrades -yq \ - # g++-multilib gcc-multilib libcurl4-openssl-dev:i386 libgc-dev:i386 \ - # libsdl1.2-dev:i386 libsfml-dev:i386 libglib2.0-dev:i386 libffi-dev:i386 + DEBIAN_FRONTEND='noninteractive' \ + echo_run sudo apt-fast install --no-install-recommends --allow-downgrades -yq \ + g++-multilib gcc-multilib libcurl4-openssl-dev:i386 libgc-dev:i386 \ + libsdl1.2-dev:i386 libsfml-dev:i386 libglib2.0-dev:i386 libffi-dev:i386 cat << EOF > bin/gcc #!/bin/bash From 1a4185b9fa52bdd6fc71c5453f8630dab13e9141 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Mon, 15 Mar 2021 17:19:41 -0700 Subject: [PATCH 29/67] _ --- azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b8afb45023849..59a8206a83ba3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -23,6 +23,8 @@ jobs: pool: vmImage: $(vmImage) + container: ubuntu:18.04 + workspace: clean: all From 89a0e0600ba88847f9cf63480e1561fa05e8b4c2 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Mon, 15 Mar 2021 17:43:24 -0700 Subject: [PATCH 30/67] docker --- azure-pipelines.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 59a8206a83ba3..eabf370e1e6db 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -23,7 +23,10 @@ jobs: pool: vmImage: $(vmImage) - container: ubuntu:18.04 + # container: ubuntu:18.04 + # container: i386/ubuntu + # docker run --rm -it arm32v7/ubuntu:18.04 bash + container: i386/ubuntu:18.04 workspace: clean: all @@ -57,13 +60,13 @@ jobs: - bash: | set -e . ci/funs.sh - echo_run sudo dpkg --add-architecture i386 - # echo_run sudo apt-fast update -qq - echo_run sudo apt-fast update -qq || echo "failed, see bug #17343" + echo_run dpkg --add-architecture i386 + # echo_run apt-fast update -qq + echo_run apt-fast update -qq || echo "failed, see bug #17343" # `:i386` (e.g. in `libffi-dev:i386`) is needed otherwise you may get: # `could not load: libffi.so` during dynamic loading. DEBIAN_FRONTEND='noninteractive' \ - echo_run sudo apt-fast install --no-install-recommends --allow-downgrades -yq \ + echo_run apt-fast install --no-install-recommends --allow-downgrades -yq \ g++-multilib gcc-multilib libcurl4-openssl-dev:i386 libgc-dev:i386 \ libsdl1.2-dev:i386 libsfml-dev:i386 libglib2.0-dev:i386 libffi-dev:i386 From 371241fbfeaa54fe08f01b9e07ae46d2b7db85b0 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Mon, 15 Mar 2021 18:11:44 -0700 Subject: [PATCH 31/67] _ --- azure-pipelines.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index eabf370e1e6db..bc96fbbfac187 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -23,10 +23,10 @@ jobs: pool: vmImage: $(vmImage) - # container: ubuntu:18.04 + container: ubuntu:18.04 # container: i386/ubuntu # docker run --rm -it arm32v7/ubuntu:18.04 bash - container: i386/ubuntu:18.04 + # container: i386/ubuntu:18.04 workspace: clean: all @@ -58,8 +58,11 @@ jobs: condition: and(eq(variables['Agent.OS'], 'Linux'), eq(variables['CPU'], 'amd64')) - bash: | + echo "ok1" set -e + echo "ok2" . ci/funs.sh + echo "ok3" echo_run dpkg --add-architecture i386 # echo_run apt-fast update -qq echo_run apt-fast update -qq || echo "failed, see bug #17343" From 05ee2ab7bc46093b84a9e3c5abbf0e4db6da8975 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Tue, 16 Mar 2021 02:01:11 -0700 Subject: [PATCH 32/67] _ --- azure-pipelines.yml | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bc96fbbfac187..d3883a6b231c0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -39,7 +39,10 @@ jobs: - checkout: self fetchDepth: 1 - - bash: git clone --depth 1 https://github.com/nim-lang/csources + - bash: | + . ci/funs.sh + apt install git + git clone --depth 1 https://github.com/nim-lang/csources displayName: 'Checkout Nim csources' - task: NodeTool@0 @@ -58,18 +61,21 @@ jobs: condition: and(eq(variables['Agent.OS'], 'Linux'), eq(variables['CPU'], 'amd64')) - bash: | - echo "ok1" - set -e - echo "ok2" + set +e . ci/funs.sh - echo "ok3" - echo_run dpkg --add-architecture i386 + # echo_run dpkg --add-architecture i386 # echo_run apt-fast update -qq - echo_run apt-fast update -qq || echo "failed, see bug #17343" + echo_run apt update + # echo_run apt-fast update -qq || echo "failed, see bug #17343" # `:i386` (e.g. in `libffi-dev:i386`) is needed otherwise you may get: # `could not load: libffi.so` during dynamic loading. - DEBIAN_FRONTEND='noninteractive' \ - echo_run apt-fast install --no-install-recommends --allow-downgrades -yq \ + + export DEBIAN_FRONTEND='noninteractive' + echo_run apt install --no-install-recommends --allow-downgrades -y \ + g++-multilib gcc-multilib libcurl4-openssl-dev:i386 libgc-dev:i386 \ + libsdl1.2-dev:i386 libsfml-dev:i386 libglib2.0-dev:i386 libffi-dev:i386 + + echo_run apt install --no-install-recommends --allow-downgrades -yq \ g++-multilib gcc-multilib libcurl4-openssl-dev:i386 libgc-dev:i386 \ libsdl1.2-dev:i386 libsfml-dev:i386 libglib2.0-dev:i386 libffi-dev:i386 From c085b8177a008365e91c1360b9bf1a3ac2755307 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Tue, 16 Mar 2021 12:35:41 -0700 Subject: [PATCH 33/67] _ --- azure-pipelines.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d3883a6b231c0..268b962759bd1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -41,9 +41,9 @@ jobs: - bash: | . ci/funs.sh - apt install git - git clone --depth 1 https://github.com/nim-lang/csources - displayName: 'Checkout Nim csources' + apt install git + git clone --depth 1 https://github.com/nim-lang/csources + displayName: 'Checkout Nim csources' - task: NodeTool@0 inputs: From d88a5a7708748c719a38ad2b1c35c7fae7142060 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Tue, 16 Mar 2021 12:52:01 -0700 Subject: [PATCH 34/67] _ --- azure-pipelines.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 268b962759bd1..3ea8e93a6fbec 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -41,9 +41,15 @@ jobs: - bash: | . ci/funs.sh - apt install git - git clone --depth 1 https://github.com/nim-lang/csources - displayName: 'Checkout Nim csources' + set +e + echo_run echo "ok1" + echo_run apt install git + echo_run echo "ok2" + echo_run apt-get install git + echo_run echo "ok3" + echo_run git clone --depth 1 https://github.com/nim-lang/csources + echo_run echo "ok4" + displayName: 'Checkout Nim csources' - task: NodeTool@0 inputs: From 928960c2cf91c5c69e8aef1f325f9fa4b53f1acb Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Tue, 16 Mar 2021 13:03:25 -0700 Subject: [PATCH 35/67] _ --- azure-pipelines.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3ea8e93a6fbec..236bb6b34d619 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -42,13 +42,15 @@ jobs: - bash: | . ci/funs.sh set +e - echo_run echo "ok1" + echo_run apt update + echo_run apt-get update echo_run apt install git - echo_run echo "ok2" echo_run apt-get install git - echo_run echo "ok3" + echo_run sudo apt install git + echo_run sudo apt-get install git + echo_run whoami + echo_run pwd echo_run git clone --depth 1 https://github.com/nim-lang/csources - echo_run echo "ok4" displayName: 'Checkout Nim csources' - task: NodeTool@0 From 7204432f320feb27edf1d5806bfbc66c1146cb98 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Tue, 16 Mar 2021 18:21:55 -0700 Subject: [PATCH 36/67] _ --- azure-pipelines.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 236bb6b34d619..913c45e6e59bd 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -39,6 +39,24 @@ jobs: - checkout: self fetchDepth: 1 + - name: install dependencies in container v2 + run: | + . ci/funs.sh + echo_run "ok1" + echo_run apt-get update + echo_run apt-get install -y software-properties-common + echo_run apt-get install -y git + echo_run add-apt-repository -y ppa:git-core/ppa + echo_run apt-get update + echo_run apt-get install -y cmake make gcc g++ git curl + + - run: | + apt-get update + apt-get install -y software-properties-common + add-apt-repository -y ppa:git-core/ppa + apt-get update + apt-get install -y cmake make gcc g++ git curl + - bash: | . ci/funs.sh set +e From 134d86918135de67f6ff76f0bb2c8615a9be819b Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Tue, 16 Mar 2021 18:23:42 -0700 Subject: [PATCH 37/67] _ --- azure-pipelines.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 913c45e6e59bd..b332977d92c46 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -50,13 +50,6 @@ jobs: echo_run apt-get update echo_run apt-get install -y cmake make gcc g++ git curl - - run: | - apt-get update - apt-get install -y software-properties-common - add-apt-repository -y ppa:git-core/ppa - apt-get update - apt-get install -y cmake make gcc g++ git curl - - bash: | . ci/funs.sh set +e From 0bb0cc47e95f39ab7b2d0a9674e698085c462023 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Tue, 16 Mar 2021 18:30:28 -0700 Subject: [PATCH 38/67] _ --- azure-pipelines.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b332977d92c46..236bb6b34d619 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -39,17 +39,6 @@ jobs: - checkout: self fetchDepth: 1 - - name: install dependencies in container v2 - run: | - . ci/funs.sh - echo_run "ok1" - echo_run apt-get update - echo_run apt-get install -y software-properties-common - echo_run apt-get install -y git - echo_run add-apt-repository -y ppa:git-core/ppa - echo_run apt-get update - echo_run apt-get install -y cmake make gcc g++ git curl - - bash: | . ci/funs.sh set +e From 7bfbb00d502e360a131a24752ac7932f6269fdbb Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Tue, 16 Mar 2021 18:31:51 -0700 Subject: [PATCH 39/67] _ --- azure-pipelines.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 236bb6b34d619..1717ac555b2d2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -39,6 +39,11 @@ jobs: - checkout: self fetchDepth: 1 + - run: | + apt-get update + apt-get install -y software-properties-common + apt-get install -y git + - bash: | . ci/funs.sh set +e From 524dc893277e3e3b917d29df96e7da1e5d957344 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Tue, 16 Mar 2021 18:37:25 -0700 Subject: [PATCH 40/67] _ --- .github/workflows/docker.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/docker.yml diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml new file mode 100644 index 0000000000000..c5351cc4aa9ad --- /dev/null +++ b/.github/workflows/docker.yml @@ -0,0 +1,22 @@ +jobs: + vm: + runs-on: ubuntu-latest + steps: + - run: | + echo This job does not specify a container. + echo It runs directly on the virtual machine. + name: Run on VM + container: + runs-on: ubuntu-latest + # container: node:10.16-jessie + # container: node:10.16-jessie + container: ubuntu:18.04 + steps: + - run: | + echo This job does specify a container. + echo It runs in the container instead of the VM. + apt update + apt-get update + apt-get install git + + name: Run in container From 57f148bcf421b557351ede3b685eca304bfd30d0 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Tue, 16 Mar 2021 18:39:13 -0700 Subject: [PATCH 41/67] _ --- .github/workflows/docker.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index c5351cc4aa9ad..e78afd3527c82 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,3 +1,8 @@ +name: Nim docker CI +on: + push: + pull_request: + jobs: vm: runs-on: ubuntu-latest From 81d4ab995df71b82c13d97afa7740a7a7eb32355 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Tue, 16 Mar 2021 18:47:07 -0700 Subject: [PATCH 42/67] _ --- .github/workflows/docker.yml | 121 +++++++++++++++++++++++++++++++---- 1 file changed, 107 insertions(+), 14 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index e78afd3527c82..50672e9fa7a21 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,27 +1,120 @@ name: Nim docker CI -on: - push: - pull_request: +on: [push, pull_request] jobs: - vm: - runs-on: ubuntu-latest - steps: - - run: | - echo This job does not specify a container. - echo It runs directly on the virtual machine. - name: Run on VM container: runs-on: ubuntu-latest # container: node:10.16-jessie - # container: node:10.16-jessie - container: ubuntu:18.04 + # container: ubuntu:18.04 + container: i386/ubuntu:18.04 steps: + - name: 'Checkout' + uses: actions/checkout@v2 + - name: 'Checkout csources' + uses: actions/checkout@v2 + with: + repository: nim-lang/csources + path: csources + + - name: 'Install node.js 12.x' + uses: actions/setup-node@v1 + with: + node-version: '12.x' + - run: | - echo This job does specify a container. - echo It runs in the container instead of the VM. apt update apt-get update apt-get install git name: Run in container + + vm: + runs-on: ubuntu-latest + steps: + - run: | + echo This job does not specify a container. + echo It runs directly on the virtual machine. + name: Run on VM + + build: + if: | + !contains(format('{0} {1}', github.event.head_commit.message, github.event.pull_request.title), '[skip ci]') + strategy: + fail-fast: false + matrix: + os: [ubuntu-18.04, macos-10.15] + cpu: [amd64] + batch: ["0_3", "1_3", "2_3"] # list of `index_num` + name: '${{ matrix.os }} (batch: ${{ matrix.batch }})' + runs-on: ${{ matrix.os }} + env: + NIM_TEST_PACKAGES: "1" + NIM_TESTAMENT_BATCH: ${{ matrix.batch }} + steps: + - name: 'Checkout' + uses: actions/checkout@v2 + - name: 'Checkout csources' + uses: actions/checkout@v2 + with: + repository: nim-lang/csources + path: csources + + - name: 'Install node.js 12.x' + uses: actions/setup-node@v1 + with: + node-version: '12.x' + - name: 'Install dependencies (Linux amd64)' + if: runner.os == 'Linux' && matrix.cpu == 'amd64' + run: | + sudo apt-fast update -qq + DEBIAN_FRONTEND='noninteractive' \ + sudo apt-fast install --no-install-recommends -yq \ + libcurl4-openssl-dev libgc-dev libsdl1.2-dev libsfml-dev \ + valgrind libc6-dbg libblas-dev xorg-dev + - name: 'Install dependencies (macOS)' + if: runner.os == 'macOS' + run: brew install boehmgc make sfml gtk+3 + - name: 'Install dependencies (Windows)' + if: runner.os == 'Windows' + shell: bash + run: | + mkdir dist + curl -L https://nim-lang.org/download/mingw64.7z -o dist/mingw64.7z + curl -L https://nim-lang.org/download/dlls.zip -o dist/dlls.zip + 7z x dist/mingw64.7z -odist + 7z x dist/dlls.zip -obin + echo "${{ github.workspace }}/dist/mingw64/bin" >> "${GITHUB_PATH}" + + - name: 'Add build binaries to PATH' + shell: bash + run: echo "${{ github.workspace }}/bin" >> "${GITHUB_PATH}" + + - name: 'Build csources' + shell: bash + run: | + ncpu= + case '${{ runner.os }}' in + 'Linux') + ncpu=$(nproc) + ;; + 'macOS') + ncpu=$(sysctl -n hw.ncpu) + ;; + 'Windows') + ncpu=$NUMBER_OF_PROCESSORS + ;; + esac + [[ -z "$ncpu" || $ncpu -le 0 ]] && ncpu=1 + + make -C csources -j $ncpu CC=gcc ucpu='${{ matrix.cpu }}' + - name: 'Build koch' + shell: bash + run: nim c koch + - name: 'Run CI' + shell: bash + run: ./koch runCI + + - name: 'Show failed tests' + if: failure() + shell: bash + run: nim c -r tools/ci_testresults.nim From 9fc31c767a3949103c0c0e6553c1f5a90465af56 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Tue, 16 Mar 2021 18:50:56 -0700 Subject: [PATCH 43/67] _ --- .github/workflows/docker.yml | 165 ++++++++++++++++++----------------- 1 file changed, 86 insertions(+), 79 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 50672e9fa7a21..c81fa26871e82 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -22,12 +22,19 @@ jobs: node-version: '12.x' - run: | - apt update apt-get update - apt-get install git + apt-get install -y software-properties-common + add-apt-repository -y ppa:git-core/ppa + apt-get update + apt-get install -y cmake make gcc g++ git curl + pwd + ls + # git clone name: Run in container + - uses: actions/checkout@v2 + vm: runs-on: ubuntu-latest steps: @@ -36,85 +43,85 @@ jobs: echo It runs directly on the virtual machine. name: Run on VM - build: - if: | - !contains(format('{0} {1}', github.event.head_commit.message, github.event.pull_request.title), '[skip ci]') - strategy: - fail-fast: false - matrix: - os: [ubuntu-18.04, macos-10.15] - cpu: [amd64] - batch: ["0_3", "1_3", "2_3"] # list of `index_num` - name: '${{ matrix.os }} (batch: ${{ matrix.batch }})' - runs-on: ${{ matrix.os }} - env: - NIM_TEST_PACKAGES: "1" - NIM_TESTAMENT_BATCH: ${{ matrix.batch }} - steps: - - name: 'Checkout' - uses: actions/checkout@v2 - - name: 'Checkout csources' - uses: actions/checkout@v2 - with: - repository: nim-lang/csources - path: csources + # build: + # if: | + # !contains(format('{0} {1}', github.event.head_commit.message, github.event.pull_request.title), '[skip ci]') + # strategy: + # fail-fast: false + # matrix: + # os: [ubuntu-18.04, macos-10.15] + # cpu: [amd64] + # batch: ["0_3", "1_3", "2_3"] # list of `index_num` + # name: '${{ matrix.os }} (batch: ${{ matrix.batch }})' + # runs-on: ${{ matrix.os }} + # env: + # NIM_TEST_PACKAGES: "1" + # NIM_TESTAMENT_BATCH: ${{ matrix.batch }} + # steps: + # - name: 'Checkout' + # uses: actions/checkout@v2 + # - name: 'Checkout csources' + # uses: actions/checkout@v2 + # with: + # repository: nim-lang/csources + # path: csources - - name: 'Install node.js 12.x' - uses: actions/setup-node@v1 - with: - node-version: '12.x' - - name: 'Install dependencies (Linux amd64)' - if: runner.os == 'Linux' && matrix.cpu == 'amd64' - run: | - sudo apt-fast update -qq - DEBIAN_FRONTEND='noninteractive' \ - sudo apt-fast install --no-install-recommends -yq \ - libcurl4-openssl-dev libgc-dev libsdl1.2-dev libsfml-dev \ - valgrind libc6-dbg libblas-dev xorg-dev - - name: 'Install dependencies (macOS)' - if: runner.os == 'macOS' - run: brew install boehmgc make sfml gtk+3 - - name: 'Install dependencies (Windows)' - if: runner.os == 'Windows' - shell: bash - run: | - mkdir dist - curl -L https://nim-lang.org/download/mingw64.7z -o dist/mingw64.7z - curl -L https://nim-lang.org/download/dlls.zip -o dist/dlls.zip - 7z x dist/mingw64.7z -odist - 7z x dist/dlls.zip -obin - echo "${{ github.workspace }}/dist/mingw64/bin" >> "${GITHUB_PATH}" + # - name: 'Install node.js 12.x' + # uses: actions/setup-node@v1 + # with: + # node-version: '12.x' + # - name: 'Install dependencies (Linux amd64)' + # if: runner.os == 'Linux' && matrix.cpu == 'amd64' + # run: | + # sudo apt-fast update -qq + # DEBIAN_FRONTEND='noninteractive' \ + # sudo apt-fast install --no-install-recommends -yq \ + # libcurl4-openssl-dev libgc-dev libsdl1.2-dev libsfml-dev \ + # valgrind libc6-dbg libblas-dev xorg-dev + # - name: 'Install dependencies (macOS)' + # if: runner.os == 'macOS' + # run: brew install boehmgc make sfml gtk+3 + # - name: 'Install dependencies (Windows)' + # if: runner.os == 'Windows' + # shell: bash + # run: | + # mkdir dist + # curl -L https://nim-lang.org/download/mingw64.7z -o dist/mingw64.7z + # curl -L https://nim-lang.org/download/dlls.zip -o dist/dlls.zip + # 7z x dist/mingw64.7z -odist + # 7z x dist/dlls.zip -obin + # echo "${{ github.workspace }}/dist/mingw64/bin" >> "${GITHUB_PATH}" - - name: 'Add build binaries to PATH' - shell: bash - run: echo "${{ github.workspace }}/bin" >> "${GITHUB_PATH}" + # - name: 'Add build binaries to PATH' + # shell: bash + # run: echo "${{ github.workspace }}/bin" >> "${GITHUB_PATH}" - - name: 'Build csources' - shell: bash - run: | - ncpu= - case '${{ runner.os }}' in - 'Linux') - ncpu=$(nproc) - ;; - 'macOS') - ncpu=$(sysctl -n hw.ncpu) - ;; - 'Windows') - ncpu=$NUMBER_OF_PROCESSORS - ;; - esac - [[ -z "$ncpu" || $ncpu -le 0 ]] && ncpu=1 + # - name: 'Build csources' + # shell: bash + # run: | + # ncpu= + # case '${{ runner.os }}' in + # 'Linux') + # ncpu=$(nproc) + # ;; + # 'macOS') + # ncpu=$(sysctl -n hw.ncpu) + # ;; + # 'Windows') + # ncpu=$NUMBER_OF_PROCESSORS + # ;; + # esac + # [[ -z "$ncpu" || $ncpu -le 0 ]] && ncpu=1 - make -C csources -j $ncpu CC=gcc ucpu='${{ matrix.cpu }}' - - name: 'Build koch' - shell: bash - run: nim c koch - - name: 'Run CI' - shell: bash - run: ./koch runCI + # make -C csources -j $ncpu CC=gcc ucpu='${{ matrix.cpu }}' + # - name: 'Build koch' + # shell: bash + # run: nim c koch + # - name: 'Run CI' + # shell: bash + # run: ./koch runCI - - name: 'Show failed tests' - if: failure() - shell: bash - run: nim c -r tools/ci_testresults.nim + # - name: 'Show failed tests' + # if: failure() + # shell: bash + # run: nim c -r tools/ci_testresults.nim From 09d45c9db46e1fd86a69120190ca887394c8a802 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Tue, 16 Mar 2021 18:52:30 -0700 Subject: [PATCH 44/67] _ --- .github/workflows/docker.yml | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index c81fa26871e82..a1f525dedaaa2 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -8,13 +8,15 @@ jobs: # container: ubuntu:18.04 container: i386/ubuntu:18.04 steps: - - name: 'Checkout' - uses: actions/checkout@v2 - - name: 'Checkout csources' - uses: actions/checkout@v2 - with: - repository: nim-lang/csources - path: csources + + # - name: 'Checkout' + # uses: actions/checkout@v2 + + # - name: 'Checkout csources' + # uses: actions/checkout@v2 + # with: + # repository: nim-lang/csources + # path: csources - name: 'Install node.js 12.x' uses: actions/setup-node@v1 @@ -35,13 +37,13 @@ jobs: - uses: actions/checkout@v2 - vm: - runs-on: ubuntu-latest - steps: - - run: | - echo This job does not specify a container. - echo It runs directly on the virtual machine. - name: Run on VM + # vm: + # runs-on: ubuntu-latest + # steps: + # - run: | + # echo This job does not specify a container. + # echo It runs directly on the virtual machine. + # name: Run on VM # build: # if: | From 3e2e055f7c307c458a623fabf55895cdc7e82d0a Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Tue, 16 Mar 2021 18:53:39 -0700 Subject: [PATCH 45/67] _ --- .github/workflows/docker.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a1f525dedaaa2..b78c4a80a5957 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -18,10 +18,10 @@ jobs: # repository: nim-lang/csources # path: csources - - name: 'Install node.js 12.x' - uses: actions/setup-node@v1 - with: - node-version: '12.x' + # - name: 'Install node.js 12.x' + # uses: actions/setup-node@v1 + # with: + # node-version: '12.x' - run: | apt-get update From 7024b18d0b759c382d89cd7ebe97c9a3f1056029 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Tue, 16 Mar 2021 19:12:01 -0700 Subject: [PATCH 46/67] _ --- .github/workflows/docker.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index b78c4a80a5957..971b056132468 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -24,12 +24,11 @@ jobs: # node-version: '12.x' - run: | - apt-get update - apt-get install -y software-properties-common - add-apt-repository -y ppa:git-core/ppa - apt-get update - apt-get install -y cmake make gcc g++ git curl - + apt-get update -qq + apt-get install -yqq software-properties-common + add-apt-repository -yqq ppa:git-core/ppa + apt-get update -qq + apt-get install -yqq cmake make gcc g++ git curl pwd ls # git clone From 4840f0ce640f457df9ac3e0ed982dc860645b6ac Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Tue, 16 Mar 2021 19:12:08 -0700 Subject: [PATCH 47/67] _ --- .github/workflows/docker2.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/workflows/docker2.yml diff --git a/.github/workflows/docker2.yml b/.github/workflows/docker2.yml new file mode 100644 index 0000000000000..782c83020b43b --- /dev/null +++ b/.github/workflows/docker2.yml @@ -0,0 +1,16 @@ +# action.yml +name: 'Hello World' +description: 'Greet someone and record the time' +inputs: + who-to-greet: # id of input + description: 'Who to greet' + required: true + default: 'World' +outputs: + time: # id of output + description: 'The time we greeted you' +runs: + using: 'docker' + image: 'Dockerfile' + args: + - ${{ inputs.who-to-greet }} From 1fe8b4ba0209cfcb7e7e3041cefde790fa599113 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Tue, 16 Mar 2021 19:13:41 -0700 Subject: [PATCH 48/67] _ --- .github/workflows/docker2.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/docker2.yml b/.github/workflows/docker2.yml index 782c83020b43b..cf5863c2ce189 100644 --- a/.github/workflows/docker2.yml +++ b/.github/workflows/docker2.yml @@ -1,3 +1,6 @@ +name: Nim docker CI +# on: [push, pull_request] +on: pull_request # action.yml name: 'Hello World' description: 'Greet someone and record the time' From 61da2451887d83a79f935df10c8a3849818a39ac Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Tue, 16 Mar 2021 19:14:49 -0700 Subject: [PATCH 49/67] _ --- .github/workflows/docker2.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker2.yml b/.github/workflows/docker2.yml index cf5863c2ce189..731a44cf01a13 100644 --- a/.github/workflows/docker2.yml +++ b/.github/workflows/docker2.yml @@ -1,8 +1,8 @@ -name: Nim docker CI +# name: Nim docker CI # on: [push, pull_request] -on: pull_request # action.yml name: 'Hello World' +on: pull_request description: 'Greet someone and record the time' inputs: who-to-greet: # id of input From 17bb4255fa4c8bd2109795c5242bcc9d81fdd937 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Tue, 16 Mar 2021 19:18:52 -0700 Subject: [PATCH 50/67] _ --- .github/workflows/docker2.yml => docker2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/docker2.yml => docker2.yml (95%) diff --git a/.github/workflows/docker2.yml b/docker2.yml similarity index 95% rename from .github/workflows/docker2.yml rename to docker2.yml index 731a44cf01a13..291f3e59084f1 100644 --- a/.github/workflows/docker2.yml +++ b/docker2.yml @@ -2,7 +2,7 @@ # on: [push, pull_request] # action.yml name: 'Hello World' -on: pull_request +# on: pull_request description: 'Greet someone and record the time' inputs: who-to-greet: # id of input From 7228a9ed34e64ff4f32b7b0ac5ec172de6f5f4d0 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Tue, 16 Mar 2021 19:24:13 -0700 Subject: [PATCH 51/67] _ --- .github/workflows/{docker.yml => docker.yml.disabled} | 0 docker2.yml => .github/workflows/docker2.yml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{docker.yml => docker.yml.disabled} (100%) rename docker2.yml => .github/workflows/docker2.yml (100%) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml.disabled similarity index 100% rename from .github/workflows/docker.yml rename to .github/workflows/docker.yml.disabled diff --git a/docker2.yml b/.github/workflows/docker2.yml similarity index 100% rename from docker2.yml rename to .github/workflows/docker2.yml From a46cba9ca6e0cbc51414fb95365dc88795a677e4 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Tue, 16 Mar 2021 19:25:54 -0700 Subject: [PATCH 52/67] _ --- .github/workflows/docker2.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker2.yml b/.github/workflows/docker2.yml index 291f3e59084f1..f233c5e43a697 100644 --- a/.github/workflows/docker2.yml +++ b/.github/workflows/docker2.yml @@ -1,7 +1,7 @@ -# name: Nim docker CI +name: Nim docker2 CI # on: [push, pull_request] +on: [pull_request] # action.yml -name: 'Hello World' # on: pull_request description: 'Greet someone and record the time' inputs: From e0648b4915957cb68d74c3f21fafbefcdd5a1281 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Tue, 16 Mar 2021 23:47:22 -0700 Subject: [PATCH 53/67] _ --- .github/workflows/docker2.yml | 79 ++++++++++++++++++++++++++--------- 1 file changed, 60 insertions(+), 19 deletions(-) diff --git a/.github/workflows/docker2.yml b/.github/workflows/docker2.yml index f233c5e43a697..e722521ab4956 100644 --- a/.github/workflows/docker2.yml +++ b/.github/workflows/docker2.yml @@ -1,19 +1,60 @@ -name: Nim docker2 CI -# on: [push, pull_request] -on: [pull_request] -# action.yml -# on: pull_request -description: 'Greet someone and record the time' -inputs: - who-to-greet: # id of input - description: 'Who to greet' - required: true - default: 'World' -outputs: - time: # id of output - description: 'The time we greeted you' -runs: - using: 'docker' - image: 'Dockerfile' - args: - - ${{ inputs.who-to-greet }} +on: [push] + +jobs: + hello_world_job: + runs-on: ubuntu-latest + name: A job to say hello + steps: + # To use this repository's private action, + # you must check out the repository + - name: Checkout + uses: actions/checkout@v2 + - name: Hello world action step + uses: ./ # Uses an action in the root directory + id: hello + with: + who-to-greet: 'Mona the Octocat' + # Use the output from the `hello` step + - name: Get the output time + run: echo "The time was ${{ steps.hello.outputs.time }}" + + +# name: Nim docker2 CI +# # on: [push, pull_request] +# on: [pull_request] + +# jobs: +# docker-example: +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v2 +# - name: Run box version +# #uses: docker://foundeo/minibox:latest +# uses: docker://i386/ubuntu:18.04 +# #container: i386/ubuntu:18.04 +# with: +# entrypoint: /opt/box/box +# args: version +# # - name: What OS is running +# # run: uname -a +# # - name: What java version do we have +# # run: java -version + + + +# # # action.yml +# # # on: pull_request +# # description: 'Greet someone and record the time' +# # inputs: +# # who-to-greet: # id of input +# # description: 'Who to greet' +# # required: true +# # default: 'World' +# # outputs: +# # time: # id of output +# # description: 'The time we greeted you' +# # runs: +# # using: 'docker' +# # image: 'Dockerfile' +# # args: +# # - ${{ inputs.who-to-greet }} From b45706175a22a86be043bc2db691c1a5607278e7 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Tue, 16 Mar 2021 23:55:01 -0700 Subject: [PATCH 54/67] _ --- action.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 action.yml diff --git a/action.yml b/action.yml new file mode 100644 index 0000000000000..782c83020b43b --- /dev/null +++ b/action.yml @@ -0,0 +1,16 @@ +# action.yml +name: 'Hello World' +description: 'Greet someone and record the time' +inputs: + who-to-greet: # id of input + description: 'Who to greet' + required: true + default: 'World' +outputs: + time: # id of output + description: 'The time we greeted you' +runs: + using: 'docker' + image: 'Dockerfile' + args: + - ${{ inputs.who-to-greet }} From 57c8c329898e2c99dd4d30d088f52712a8e93725 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Wed, 17 Mar 2021 00:04:42 -0700 Subject: [PATCH 55/67] _ --- .github/workflows/docker2.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker2.yml b/.github/workflows/docker2.yml index e722521ab4956..43ab8a03f842e 100644 --- a/.github/workflows/docker2.yml +++ b/.github/workflows/docker2.yml @@ -9,14 +9,15 @@ jobs: # you must check out the repository - name: Checkout uses: actions/checkout@v2 - - name: Hello world action step - uses: ./ # Uses an action in the root directory - id: hello - with: - who-to-greet: 'Mona the Octocat' + - name: Hello world action step v2 + # uses: ./ # Uses an action in the root directory + image: 'Dockerfile' + # id: hello + # with: + # who-to-greet: 'Mona the Octocat' # Use the output from the `hello` step - - name: Get the output time - run: echo "The time was ${{ steps.hello.outputs.time }}" + # - name: Get the output time + # run: echo "The time was ${{ steps.hello.outputs.time }}" # name: Nim docker2 CI From bb9c9db7e33e60f98483a80ee94013297b7b9763 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Wed, 17 Mar 2021 00:05:33 -0700 Subject: [PATCH 56/67] _ --- .github/workflows/docker2.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker2.yml b/.github/workflows/docker2.yml index 43ab8a03f842e..dd49824e3784e 100644 --- a/.github/workflows/docker2.yml +++ b/.github/workflows/docker2.yml @@ -11,6 +11,7 @@ jobs: uses: actions/checkout@v2 - name: Hello world action step v2 # uses: ./ # Uses an action in the root directory + using: 'docker' image: 'Dockerfile' # id: hello # with: From 808623fbc1ca2e6f3fdcd68b253476b92b082de1 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Wed, 17 Mar 2021 00:06:48 -0700 Subject: [PATCH 57/67] _ --- .github/workflows/docker2.yml | 2 +- ci.Dockerfile | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 ci.Dockerfile diff --git a/.github/workflows/docker2.yml b/.github/workflows/docker2.yml index dd49824e3784e..26983bbcac085 100644 --- a/.github/workflows/docker2.yml +++ b/.github/workflows/docker2.yml @@ -12,7 +12,7 @@ jobs: - name: Hello world action step v2 # uses: ./ # Uses an action in the root directory using: 'docker' - image: 'Dockerfile' + image: 'ci.Dockerfile' # id: hello # with: # who-to-greet: 'Mona the Octocat' diff --git a/ci.Dockerfile b/ci.Dockerfile new file mode 100644 index 0000000000000..c4c3ea4c12d27 --- /dev/null +++ b/ci.Dockerfile @@ -0,0 +1,10 @@ +# Container image that runs your code +FROM alpine:3.10 + +# Copies your code file from your action repository to the filesystem path `/` of the container +# COPY entrypoint.sh /entrypoint.sh + +# Code file to execute when the docker container starts up (`entrypoint.sh`) +# ENTRYPOINT ["/entrypoint.sh"] +#ENTRYPOINT ["/entrypoint.sh"] +ENTRYPOINT ["sh build_all.sh"] From faff595e1fb61324cc51e55bca336e332d3512c2 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Wed, 17 Mar 2021 00:09:20 -0700 Subject: [PATCH 58/67] _ --- .github/workflows/docker2.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker2.yml b/.github/workflows/docker2.yml index 26983bbcac085..c124c7277aee8 100644 --- a/.github/workflows/docker2.yml +++ b/.github/workflows/docker2.yml @@ -11,8 +11,9 @@ jobs: uses: actions/checkout@v2 - name: Hello world action step v2 # uses: ./ # Uses an action in the root directory - using: 'docker' - image: 'ci.Dockerfile' + runs: + using: 'docker' + image: 'ci.Dockerfile' # id: hello # with: # who-to-greet: 'Mona the Octocat' From c6ee8b1f8fe2eae0f52c058f19ae643dda08a949 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Wed, 17 Mar 2021 00:14:26 -0700 Subject: [PATCH 59/67] _ --- .github/workflows/docker2.yml | 14 +++++++------- action.yml | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker2.yml b/.github/workflows/docker2.yml index c124c7277aee8..6453d11aac39f 100644 --- a/.github/workflows/docker2.yml +++ b/.github/workflows/docker2.yml @@ -10,13 +10,13 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Hello world action step v2 - # uses: ./ # Uses an action in the root directory - runs: - using: 'docker' - image: 'ci.Dockerfile' - # id: hello - # with: - # who-to-greet: 'Mona the Octocat' + uses: ./ # Uses an action in the root directory + # runs: + # using: 'docker' + # image: 'ci.Dockerfile' + id: hello + with: + who-to-greet: 'Mona the Octocat' # Use the output from the `hello` step # - name: Get the output time # run: echo "The time was ${{ steps.hello.outputs.time }}" diff --git a/action.yml b/action.yml index 782c83020b43b..303bc5161988e 100644 --- a/action.yml +++ b/action.yml @@ -11,6 +11,6 @@ outputs: description: 'The time we greeted you' runs: using: 'docker' - image: 'Dockerfile' + image: 'ci.Dockerfile' args: - ${{ inputs.who-to-greet }} From d053d9f052cd189e6997f5f46e71667c6a2d4e4e Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Wed, 17 Mar 2021 00:18:06 -0700 Subject: [PATCH 60/67] _ --- ci.Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci.Dockerfile b/ci.Dockerfile index c4c3ea4c12d27..11a48fd8b39f0 100644 --- a/ci.Dockerfile +++ b/ci.Dockerfile @@ -7,4 +7,6 @@ FROM alpine:3.10 # Code file to execute when the docker container starts up (`entrypoint.sh`) # ENTRYPOINT ["/entrypoint.sh"] #ENTRYPOINT ["/entrypoint.sh"] -ENTRYPOINT ["sh build_all.sh"] +#ENTRYPOINT ["sh build_all.sh"] +CMD "pwd && ls && sh build_all.sh" + From 661dfa725553d78ea26653728d9ab4b8596143ee Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Wed, 17 Mar 2021 00:23:08 -0700 Subject: [PATCH 61/67] _ --- ci.Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci.Dockerfile b/ci.Dockerfile index 11a48fd8b39f0..05eadd28c39be 100644 --- a/ci.Dockerfile +++ b/ci.Dockerfile @@ -8,5 +8,6 @@ FROM alpine:3.10 # ENTRYPOINT ["/entrypoint.sh"] #ENTRYPOINT ["/entrypoint.sh"] #ENTRYPOINT ["sh build_all.sh"] -CMD "pwd && ls && sh build_all.sh" +# CMD "pwd && ls && sh build_all.sh" +ENTRYPOINT pwd && ls && sh build_all.sh From e28f6f0f7b6653f3a1422ecfaab8d40124230d91 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Wed, 17 Mar 2021 00:27:10 -0700 Subject: [PATCH 62/67] _ --- ci.Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci.Dockerfile b/ci.Dockerfile index 05eadd28c39be..bc735b8f276ac 100644 --- a/ci.Dockerfile +++ b/ci.Dockerfile @@ -9,5 +9,6 @@ FROM alpine:3.10 #ENTRYPOINT ["/entrypoint.sh"] #ENTRYPOINT ["sh build_all.sh"] # CMD "pwd && ls && sh build_all.sh" -ENTRYPOINT pwd && ls && sh build_all.sh +# ENTRYPOINT pwd && ls && sh build_all.sh +ENTRYPOINT sh ci/dockerrun.sh From fa76d1a1c007ea27ca2f2e0aff1199868b25d6fa Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Wed, 17 Mar 2021 00:27:39 -0700 Subject: [PATCH 63/67] _ --- ci/dockerrun.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 ci/dockerrun.sh diff --git a/ci/dockerrun.sh b/ci/dockerrun.sh new file mode 100644 index 0000000000000..2d68062009569 --- /dev/null +++ b/ci/dockerrun.sh @@ -0,0 +1,10 @@ +. ci/funs.sh +echo_run pwd +echo_run apt-get update +echo_run apt-get install -y software-properties-common +echo_run add-apt-repository -y ppa:git-core/ppa +echo_run apt-get update +echo_run apt-get install -yq cmake make gcc g++ git curl + +echo_run sh build_all.sh +echo_run ./koch runCI From 62311cb950dc1d037b89f196e2f75804edf23982 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Wed, 17 Mar 2021 00:28:36 -0700 Subject: [PATCH 64/67] _ --- ci.Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci.Dockerfile b/ci.Dockerfile index bc735b8f276ac..5e26e8a93857f 100644 --- a/ci.Dockerfile +++ b/ci.Dockerfile @@ -1,5 +1,6 @@ # Container image that runs your code -FROM alpine:3.10 +# FROM alpine:3.10 +FROM i386/ubuntu:18.04 # Copies your code file from your action repository to the filesystem path `/` of the container # COPY entrypoint.sh /entrypoint.sh From aa93e573f70f966b75366ebf35a96cdf1d8bf7ec Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Wed, 17 Mar 2021 00:35:17 -0700 Subject: [PATCH 65/67] _ --- ci.Dockerfile | 11 ----------- ci/dockerrun.sh | 3 ++- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/ci.Dockerfile b/ci.Dockerfile index 5e26e8a93857f..0ec6e3946e66e 100644 --- a/ci.Dockerfile +++ b/ci.Dockerfile @@ -1,15 +1,4 @@ -# Container image that runs your code # FROM alpine:3.10 FROM i386/ubuntu:18.04 - -# Copies your code file from your action repository to the filesystem path `/` of the container -# COPY entrypoint.sh /entrypoint.sh - -# Code file to execute when the docker container starts up (`entrypoint.sh`) -# ENTRYPOINT ["/entrypoint.sh"] -#ENTRYPOINT ["/entrypoint.sh"] -#ENTRYPOINT ["sh build_all.sh"] -# CMD "pwd && ls && sh build_all.sh" -# ENTRYPOINT pwd && ls && sh build_all.sh ENTRYPOINT sh ci/dockerrun.sh diff --git a/ci/dockerrun.sh b/ci/dockerrun.sh index 2d68062009569..1afd1c1159c9c 100644 --- a/ci/dockerrun.sh +++ b/ci/dockerrun.sh @@ -1,10 +1,11 @@ +set -e . ci/funs.sh -echo_run pwd echo_run apt-get update echo_run apt-get install -y software-properties-common echo_run add-apt-repository -y ppa:git-core/ppa echo_run apt-get update echo_run apt-get install -yq cmake make gcc g++ git curl +export CPU=i386 echo_run sh build_all.sh echo_run ./koch runCI From 96db819b45c235935ec94c2e9d773276799fe966 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Wed, 17 Mar 2021 00:38:56 -0700 Subject: [PATCH 66/67] _ --- ci/dockerrun.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/dockerrun.sh b/ci/dockerrun.sh index 1afd1c1159c9c..fb5ac86dafa5c 100644 --- a/ci/dockerrun.sh +++ b/ci/dockerrun.sh @@ -6,6 +6,6 @@ echo_run add-apt-repository -y ppa:git-core/ppa echo_run apt-get update echo_run apt-get install -yq cmake make gcc g++ git curl -export CPU=i386 -echo_run sh build_all.sh +# export CPU=i386 +echo_run sh build_all.sh --cpu i386 echo_run ./koch runCI From 9e3b11dcd9b6f18804997d3d546af6dbd4a2f2d3 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Wed, 17 Mar 2021 00:40:55 -0700 Subject: [PATCH 67/67] _ --- build_all.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build_all.sh b/build_all.sh index e66980e569a44..1cbbd7d7e193d 100755 --- a/build_all.sh +++ b/build_all.sh @@ -17,16 +17,21 @@ nim_csources=bin/nim_csources build_nim_csources_via_script(){ echo_run cd csources + echo "D20210317T004050" + echo "$@" echo_run sh build.sh "$@" } build_nim_csources(){ # avoid changing dir in case of failure ( + echo_run echo "ok1" if [ $# -ne 0 ]; then # some args were passed (e.g.: `--cpu i386`), need to call build.sh + echo_run echo "ok2" build_nim_csources_via_script "$@" else + echo_run echo "ok3" # no args, use multiple Make jobs (5X faster on 16 cores: 10s instead of 50s) makeX=make unamestr=$(uname)