From b1c5c7a4a2876311d69fccedad3714bbd22bffcd Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Fri, 14 May 2021 10:27:15 -0700 Subject: [PATCH] PRTEMP: investigate windows --- .github/workflows/ci_docs.yml | 112 ------------------------------ .github/workflows/ci_packages.yml | 72 ------------------- azure-pipelines.yml | 32 ++++----- 3 files changed, 16 insertions(+), 200 deletions(-) delete mode 100644 .github/workflows/ci_docs.yml delete mode 100644 .github/workflows/ci_packages.yml diff --git a/.github/workflows/ci_docs.yml b/.github/workflows/ci_docs.yml deleted file mode 100644 index 364c0505152b2..0000000000000 --- a/.github/workflows/ci_docs.yml +++ /dev/null @@ -1,112 +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: - strategy: - fail-fast: false - matrix: - target: [linux, windows, osx] - include: - - target: linux - os: ubuntu-20.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 - with: - fetch-depth: 2 - - - 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: 'System information' - shell: bash - run: . ci/funs.sh && nimCiSystemInfo - - - name: 'Build csourcesAny (posix)' - # this would work on windows and other CI use this on windows, - # but we ensure here that `ci/build_autogen.bat` keeps working on windows. - if: runner.os != 'Windows' - shell: bash - run: . ci/funs.sh && nimBuildCsourcesIfNeeded CC=gcc - # was previously using caching via `actions/cache@v1` but this wasn't - # used in other CI pipelines and it's unclear the added complexity - # was worth the saving; can be revisited if needed. - - - name: 'Build csourcesAny (windows)' - if: runner.os == 'Windows' - shell: cmd - run: ci/build_autogen.bat - - - 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 d033aba1070d8..0000000000000 --- a/.github/workflows/ci_packages.yml +++ /dev/null @@ -1,72 +0,0 @@ -name: Packages CI -on: [push, pull_request] - -jobs: - build: - strategy: - fail-fast: false - matrix: - os: [ubuntu-20.04, macos-10.15] - cpu: [amd64] - batch: ["allowed_failures", "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 - with: - fetch-depth: 2 - - - name: 'Install node.js 16.x' - uses: actions/setup-node@v2 - with: - node-version: '16.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: 'System information' - shell: bash - run: . ci/funs.sh && nimCiSystemInfo - - - name: 'Build csourcesAny' - shell: bash - run: . ci/funs.sh && nimBuildCsourcesIfNeeded 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 112fb0a6236e8..d4576affbc5ad 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -18,22 +18,22 @@ jobs: strategy: matrix: - Linux_amd64: - vmImage: 'ubuntu-16.04' - CPU: amd64 - # pending bug #17325 (broken again) - # 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' - # CPU: i386 - OSX_amd64: - vmImage: 'macOS-10.15' - CPU: amd64 - OSX_amd64_cpp: - vmImage: 'macOS-10.15' - CPU: amd64 - NIM_COMPILE_TO_CPP: true + # Linux_amd64: + # vmImage: 'ubuntu-16.04' + # CPU: amd64 + # # pending bug #17325 (broken again) + # # 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' + # # 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