From 8e168f1578bb695a0ceab038dc3cb3fd52570589 Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Sun, 15 Nov 2020 08:23:03 -0500 Subject: [PATCH 01/14] Update stack.yaml.lock --- stack.yaml.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stack.yaml.lock b/stack.yaml.lock index 6b3c445..6a1ae68 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -33,12 +33,12 @@ packages: original: hackage: strict-list-0.1.4 - completed: - hackage: ghc-exactprint-0.5.8.2@sha256:b078e02ce263db6214f8418c8b6f6be1c8a7ca1499bb2f8936b91b5ed210faa5,7901 + hackage: ghc-exactprint-0.6.2@sha256:d822f64351e9a8e03d9bad35c8fdf558d30dc396801b396c52b5d5bffaee9108,8368 pantry-tree: - size: 83871 - sha256: 1dc1dc7f036dfb8e7642deaeb2845c62731085abc29a1494c22cd6b1b5a18d16 + size: 85384 + sha256: d904de9c01e58bfa091d7caa09e0423e9d2932b7b3490c4d83140731f4473877 original: - hackage: ghc-exactprint-0.5.8.2 + hackage: ghc-exactprint-0.6.2 snapshots: - completed: size: 499461 -- 2.30.2 From d5a5bec7297c4b84b3d5a2bdb045f194a36e3ea8 Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Sun, 15 Nov 2020 08:28:00 -0500 Subject: [PATCH 02/14] Start setting up GitHub Actions --- .github/workflows/ci.yaml | 42 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 .github/workflows/ci.yaml diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml new file mode 100644 index 0000000..bc63b06 --- /dev/null +++ b/.github/workflows/ci.yaml @@ -0,0 +1,42 @@ +name: CI +on: + pull_request: + branches: + - master + push: + branches: + - master +jobs: + build: + strategy: + matrix: + os: + - ubuntu-18.04 + ghc: + - 8.8.4 + cabal: + - 3.2.0.0 + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v2 + - id: setup-haskell + uses: actions/setup-haskell@v1 + with: + ghc-version: ${{ matrix.ghc }} + cabal-version: ${{ matrix.cabal }} + - run: cabal freeze + - run: cat cabal.project.freeze + - uses: actions/cache@v2 + with: + path: ${{ steps.setup-haskell.outputs.cabal-store }} + key: ${{ matrix.os }}-${{ matrix.ghc }}-${{ matrix.cabal }}-${{ hashFiles('cabal.project.freeze') }} + restore-keys: | + ${{ matrix.os }}-${{ matrix.ghc }}-${{ matrix.cabal }}- + ${{ matrix.os }}-${{ matrix.ghc }}- + - run: cabal test --test-show-details direct + - run: cabal sdist + - uses: actions/upload-artifact@v2 + with: + path: dist-newstyle/sdist/brittany-*.tar.gz + name: brittany-${{ github.sha }}.tar.gz + - run: cabal check -- 2.30.2 From e88872994b73fb9409d0986a7340b2f6022cc384 Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Sun, 15 Nov 2020 08:41:43 -0500 Subject: [PATCH 03/14] Also test on macOS --- .github/workflows/ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index bc63b06..8897a64 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -11,6 +11,7 @@ jobs: strategy: matrix: os: + - macos-10.15 - ubuntu-18.04 ghc: - 8.8.4 -- 2.30.2 From 01de8ea9b1bb75daaf843c50444a6c1fe9868a26 Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Sun, 15 Nov 2020 08:43:37 -0500 Subject: [PATCH 04/14] Only upload artifacts from Ubuntu --- .github/workflows/ci.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8897a64..6d189a8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -36,7 +36,8 @@ jobs: ${{ matrix.os }}-${{ matrix.ghc }}- - run: cabal test --test-show-details direct - run: cabal sdist - - uses: actions/upload-artifact@v2 + - if: matrix.os == 'ubuntu-18.04' + uses: actions/upload-artifact@v2 with: path: dist-newstyle/sdist/brittany-*.tar.gz name: brittany-${{ github.sha }}.tar.gz -- 2.30.2 From 0a48b0f1064e64c6ce8db7298ef237f07bbf1600 Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Sun, 15 Nov 2020 08:52:02 -0500 Subject: [PATCH 05/14] Also test on Windows --- .github/workflows/ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6d189a8..ba48686 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -13,6 +13,7 @@ jobs: os: - macos-10.15 - ubuntu-18.04 + - windows-2019 ghc: - 8.8.4 cabal: -- 2.30.2 From 05dd912283513436f63c5c2739da066742db5502 Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Sun, 15 Nov 2020 08:58:21 -0500 Subject: [PATCH 06/14] Also test with GHC 8.6.5 --- .github/workflows/ci.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ba48686..dfa79c0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -18,6 +18,10 @@ jobs: - 8.8.4 cabal: - 3.2.0.0 + include: + - os: ubuntu-18.04 + ghc: 8.6.5 + cabal: 3.2.0.0 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 @@ -37,7 +41,7 @@ jobs: ${{ matrix.os }}-${{ matrix.ghc }}- - run: cabal test --test-show-details direct - run: cabal sdist - - if: matrix.os == 'ubuntu-18.04' + - if: matrix.os == 'ubuntu-18.04' && matrix.ghc == '8.8.4' uses: actions/upload-artifact@v2 with: path: dist-newstyle/sdist/brittany-*.tar.gz -- 2.30.2 From 52603fa8cb7b0c6c0440d2aaa10c62bf3428c5ed Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Sun, 15 Nov 2020 09:01:51 -0500 Subject: [PATCH 07/14] Upload binaries --- .github/workflows/ci.yaml | 5 +++++ output/.gitignore | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 output/.gitignore diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index dfa79c0..483778e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -40,6 +40,11 @@ jobs: ${{ matrix.os }}-${{ matrix.ghc }}-${{ matrix.cabal }}- ${{ matrix.os }}-${{ matrix.ghc }}- - run: cabal test --test-show-details direct + - run: cabal install --installdir output --install-method copy + - uses: actions/upload-artifact@v2 + with: + path: output/brittany* + name: brittany-${{ matrix.os }}-ghc-${{ matrix.ghc }}-${{ github.sha }} - run: cabal sdist - if: matrix.os == 'ubuntu-18.04' && matrix.ghc == '8.8.4' uses: actions/upload-artifact@v2 diff --git a/output/.gitignore b/output/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/output/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore -- 2.30.2 From 213de6a16c3208b2f34688ff42efdb25f39723b5 Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Sun, 15 Nov 2020 09:21:35 -0500 Subject: [PATCH 08/14] Strip executables --- .github/workflows/ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 483778e..5a96f43 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -41,6 +41,7 @@ jobs: ${{ matrix.os }}-${{ matrix.ghc }}- - run: cabal test --test-show-details direct - run: cabal install --installdir output --install-method copy + - run: strip output/brittany* - uses: actions/upload-artifact@v2 with: path: output/brittany* -- 2.30.2 From 2d8d1f4d8685d048d9db508d665fa30a95b92d15 Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Sun, 15 Nov 2020 09:22:02 -0500 Subject: [PATCH 09/14] Also test with GHC 8.10.2 --- .github/workflows/ci.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5a96f43..a590b4a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,6 +19,9 @@ jobs: cabal: - 3.2.0.0 include: + - os: ubuntu-18.04 + ghc: 8.10.2 + cabal: 3.2.0.0 - os: ubuntu-18.04 ghc: 8.6.5 cabal: 3.2.0.0 -- 2.30.2 From 5f8d70e5f00ede2b8563722138740a4e4eb561f3 Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Sun, 15 Nov 2020 09:24:19 -0500 Subject: [PATCH 10/14] Revert "Also test with GHC 8.10.2" This reverts commit 2d8d1f4d8685d048d9db508d665fa30a95b92d15. --- .github/workflows/ci.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a590b4a..5a96f43 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,9 +19,6 @@ jobs: cabal: - 3.2.0.0 include: - - os: ubuntu-18.04 - ghc: 8.10.2 - cabal: 3.2.0.0 - os: ubuntu-18.04 ghc: 8.6.5 cabal: 3.2.0.0 -- 2.30.2 From fb8e3825aa3223ed434c9b40120bb3cdfa62f833 Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Sun, 15 Nov 2020 09:29:28 -0500 Subject: [PATCH 11/14] Also test with GHC 8.4.4 --- .github/workflows/ci.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5a96f43..8466f5a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -22,6 +22,9 @@ jobs: - os: ubuntu-18.04 ghc: 8.6.5 cabal: 3.2.0.0 + - os: ubuntu-18.04 + ghc: 8.4.4 + cabal: 3.2.0.0 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 -- 2.30.2 From f333302406882a6b102a537d1e7dfc722f4cdc9e Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Sun, 15 Nov 2020 09:29:43 -0500 Subject: [PATCH 12/14] Also test with GHC 8.2.2 --- .github/workflows/ci.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8466f5a..b916b03 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -25,6 +25,9 @@ jobs: - os: ubuntu-18.04 ghc: 8.4.4 cabal: 3.2.0.0 + - os: ubuntu-18.04 + ghc: 8.2.2 + cabal: 3.2.0.0 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 -- 2.30.2 From 751ec8848aa37645d2cb3a9e6f5f5650f2be9080 Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Sun, 15 Nov 2020 09:30:12 -0500 Subject: [PATCH 13/14] Also test with GHC 8.0.2 --- .github/workflows/ci.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b916b03..e3c50a5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -28,6 +28,9 @@ jobs: - os: ubuntu-18.04 ghc: 8.2.2 cabal: 3.2.0.0 + - os: ubuntu-18.04 + ghc: 8.0.2 + cabal: 3.2.0.0 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 -- 2.30.2 From 47865b708cafbaaddd8f1036de5441ba9b303022 Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Sun, 15 Nov 2020 09:50:41 -0500 Subject: [PATCH 14/14] Remove unnecessary call to sdist For some reason `cabal install` does sdist. --- .github/workflows/ci.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e3c50a5..2ebc7b5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -55,7 +55,6 @@ jobs: with: path: output/brittany* name: brittany-${{ matrix.os }}-ghc-${{ matrix.ghc }}-${{ github.sha }} - - run: cabal sdist - if: matrix.os == 'ubuntu-18.04' && matrix.ghc == '8.8.4' uses: actions/upload-artifact@v2 with: -- 2.30.2