From 72caeab7405141443f27e4616c8e7c2660a34e29 Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Wed, 8 Sep 2021 13:49:18 -0400 Subject: [PATCH 01/16] Update ci.yml --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0ee8f4b..657d366 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,6 +25,7 @@ jobs: steps: - uses: actions/checkout@v2 + - uses: msys2/setup-msys2@v2 - name: make run: make - name: make test From 4d97e2d5aaaeb478dcf6a4142ae27a694b6ff75a Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Wed, 8 Sep 2021 14:10:07 -0400 Subject: [PATCH 02/16] Update ci.yml --- .github/workflows/ci.yml | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 657d366..b6390ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,25 +8,34 @@ on: jobs: build: - runs-on: ${{ matrix.os }} strategy: - fail-fast: false matrix: os: - ubuntu-latest - macos-latest - - windows-latest arch: - x64 - x32 - armv7 - - aarch64 - + - aarch64 steps: - uses: actions/checkout@v2 - - uses: msys2/setup-msys2@v2 - name: make run: make - name: make test run: make test + + buildwindows: + runs-on: windows-latest + defaults: + run: + shell: msys2 {0} + steps: + - uses: actions/checkout@v2 + - uses: msys2/setup-msys2@v2 + with: + install: make mingw-w64-x86_64-clang + - run: clang --version + - run: make USECLANG=1 + - run: make test From ab8d1ad003985807f235c3182673af63a69fb485 Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Wed, 8 Sep 2021 14:22:34 -0400 Subject: [PATCH 03/16] Update ci.yml --- .github/workflows/ci.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b6390ad..9ef7702 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,10 +21,8 @@ jobs: - aarch64 steps: - uses: actions/checkout@v2 - - name: make - run: make - - name: make test - run: make test + - run: make + - run: make test buildwindows: runs-on: windows-latest @@ -34,8 +32,5 @@ jobs: steps: - uses: actions/checkout@v2 - uses: msys2/setup-msys2@v2 - with: - install: make mingw-w64-x86_64-clang - - run: clang --version - - run: make USECLANG=1 + - run: make - run: make test From ff822f3e477649bb5b9dcdfa90d3c949eed5879d Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Wed, 8 Sep 2021 14:29:53 -0400 Subject: [PATCH 04/16] Update ci.yml --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ef7702..f473aee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,5 +32,7 @@ jobs: steps: - uses: actions/checkout@v2 - uses: msys2/setup-msys2@v2 + with: + msystem: MINGW64 - run: make - run: make test From 98dcc48ba5d4a739245a297bb267a266a3037573 Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Wed, 8 Sep 2021 14:31:01 -0400 Subject: [PATCH 05/16] Update ci.yml --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f473aee..490f0f6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,5 +34,6 @@ jobs: - uses: msys2/setup-msys2@v2 with: msystem: MINGW64 + install: make - run: make - run: make test From abf5aaacafd2ac20a6ade70d072ad55818a019f9 Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Wed, 8 Sep 2021 14:32:56 -0400 Subject: [PATCH 06/16] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 490f0f6..53e4991 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,5 +35,5 @@ jobs: with: msystem: MINGW64 install: make - - run: make + - run: make CC=gcc - run: make test From fb10fcf74629a7c5a1494b6d4c9d3000e6448524 Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Wed, 8 Sep 2021 14:35:21 -0400 Subject: [PATCH 07/16] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 53e4991..abab1b2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,6 +34,6 @@ jobs: - uses: msys2/setup-msys2@v2 with: msystem: MINGW64 - install: make - - run: make CC=gcc + install: make mingw-w64-x86_64-toolchain + - run: make - run: make test From 4a52bb0dcc8730f7b8bf677c402b240b72c3df73 Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Wed, 8 Sep 2021 20:26:07 -0400 Subject: [PATCH 08/16] Update ci.yml --- .github/workflows/ci.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index abab1b2..d18a6cd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,12 @@ jobs: - run: make test buildwindows: - runs-on: windows-latest + runs-on: ${{ matrix.os }} + strategy: + matrix: + include: + - { sys: mingw64, env: x86_64 } + - { sys: mingw32, env: i686 } defaults: run: shell: msys2 {0} @@ -33,7 +38,7 @@ jobs: - uses: actions/checkout@v2 - uses: msys2/setup-msys2@v2 with: - msystem: MINGW64 - install: make mingw-w64-x86_64-toolchain + msystem: ${{matrix.sys}} + install: make mingw-w64-${{matrix.env}}-toolchain - run: make - run: make test From a2e053ee1f51289482ac4aa34dcf219ee06487ae Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Wed, 8 Sep 2021 20:27:54 -0400 Subject: [PATCH 09/16] Revert "Update ci.yml" This reverts commit 4a52bb0dcc8730f7b8bf677c402b240b72c3df73. --- .github/workflows/ci.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d18a6cd..abab1b2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,12 +25,7 @@ jobs: - run: make test buildwindows: - runs-on: ${{ matrix.os }} - strategy: - matrix: - include: - - { sys: mingw64, env: x86_64 } - - { sys: mingw32, env: i686 } + runs-on: windows-latest defaults: run: shell: msys2 {0} @@ -38,7 +33,7 @@ jobs: - uses: actions/checkout@v2 - uses: msys2/setup-msys2@v2 with: - msystem: ${{matrix.sys}} - install: make mingw-w64-${{matrix.env}}-toolchain + msystem: MINGW64 + install: make mingw-w64-x86_64-toolchain - run: make - run: make test From 7af65db469e61b9cd25eddd5a0cf255caadcd5d9 Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Wed, 8 Sep 2021 20:33:38 -0400 Subject: [PATCH 10/16] Update ci.yml --- .github/workflows/ci.yml | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index abab1b2..8c6ab9e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,15 +25,29 @@ jobs: - run: make test buildwindows: - runs-on: windows-latest - defaults: - run: - shell: msys2 {0} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: + - windows-latest + julia-arch: + - x64 + - x86 steps: - - uses: actions/checkout@v2 - - uses: msys2/setup-msys2@v2 - with: - msystem: MINGW64 - install: make mingw-w64-x86_64-toolchain - - run: make - - run: make test + - uses: actions/checkout@v2 + - name: Install i686-w64-mingw32-gcc + if: ${{ matrix.os == 'windows-latest' && matrix.julia-arch == 'x86' }} + shell: bash + run: | + choco install mingw -y --x86 --force --params "/exception:sjlj" + choco install make -y + echo "CC=i686-w64-mingw32-gcc" >> "${GITHUB_ENV}" + - name: Set compiler for 64-bit Windows + if: ${{ matrix.os == 'windows-latest' && matrix.julia-arch == 'x64' }} + shell: bash + run: | + echo "CC=x86_64-w64-mingw32-gcc" >> "${GITHUB_ENV}" + - name: Build and run tests + - run: make + - run: make test From 7b9602507e3dbdc5ab791ecd8fda7d4d1716446c Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Wed, 8 Sep 2021 20:37:22 -0400 Subject: [PATCH 11/16] Update ci.yml --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8c6ab9e..b547ddf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,5 +49,4 @@ jobs: run: | echo "CC=x86_64-w64-mingw32-gcc" >> "${GITHUB_ENV}" - name: Build and run tests - - run: make - - run: make test + run: make && make teset From d26ed9871cae9fab269d47de26a96bf758140a1f Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Wed, 8 Sep 2021 20:39:10 -0400 Subject: [PATCH 12/16] Update ci.yml --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b547ddf..9fc0267 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,8 +21,8 @@ jobs: - aarch64 steps: - uses: actions/checkout@v2 - - run: make - - run: make test + - name: Build and run tests + run: make && make test buildwindows: runs-on: ${{ matrix.os }} @@ -49,4 +49,4 @@ jobs: run: | echo "CC=x86_64-w64-mingw32-gcc" >> "${GITHUB_ENV}" - name: Build and run tests - run: make && make teset + run: make && make test From 24cec1795378118c6c6c89168abade1c48556b69 Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Wed, 8 Sep 2021 20:46:41 -0400 Subject: [PATCH 13/16] Update ci.yml --- .github/workflows/ci.yml | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9fc0267..a6e3457 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,41 +10,28 @@ jobs: build: runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: os: - ubuntu-latest - macos-latest + - windows-latest arch: - x64 - - x32 + - x86 - armv7 - aarch64 - steps: - - uses: actions/checkout@v2 - - name: Build and run tests - run: make && make test - - buildwindows: - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: - - windows-latest - julia-arch: - - x64 - - x86 steps: - uses: actions/checkout@v2 - name: Install i686-w64-mingw32-gcc - if: ${{ matrix.os == 'windows-latest' && matrix.julia-arch == 'x86' }} + if: ${{ matrix.os == 'windows-latest' && matrix.arch == 'x86' }} shell: bash run: | choco install mingw -y --x86 --force --params "/exception:sjlj" choco install make -y echo "CC=i686-w64-mingw32-gcc" >> "${GITHUB_ENV}" - name: Set compiler for 64-bit Windows - if: ${{ matrix.os == 'windows-latest' && matrix.julia-arch == 'x64' }} + if: ${{ matrix.os == 'windows-latest' && matrix.arch == 'x64' }} shell: bash run: | echo "CC=x86_64-w64-mingw32-gcc" >> "${GITHUB_ENV}" From 4a36c50b97a389a5bdd056cb387bf5f6e298bc1c Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Wed, 8 Sep 2021 20:53:03 -0400 Subject: [PATCH 14/16] Update ci.yml --- .github/workflows/ci.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a6e3457..7873843 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,15 @@ jobs: - x64 - x86 - armv7 - - aarch64 + - aarch64 + exclude: + - os: windows-latest + arch: aarch64 + - os: windows-latest + arch: armv7 + - os: windows-latest + arch: x86 + steps: - uses: actions/checkout@v2 - name: Install i686-w64-mingw32-gcc From e9932670c30bfe4da6bbc506521186da2d6dad26 Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Wed, 8 Sep 2021 20:53:52 -0400 Subject: [PATCH 15/16] Update ci.yml --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7873843..bbfa65e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,6 +28,8 @@ jobs: arch: armv7 - os: windows-latest arch: x86 + - os: macos-latest + arch: armv7 steps: - uses: actions/checkout@v2 From 437c139718f2d10e1b966b3096d79e2bfe95de59 Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Wed, 8 Sep 2021 20:54:41 -0400 Subject: [PATCH 16/16] Update ci.yml --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bbfa65e..b668b7b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,6 +30,8 @@ jobs: arch: x86 - os: macos-latest arch: armv7 + - os: macos-latest + arch: x86 steps: - uses: actions/checkout@v2