From 0f3e9200377837a3711d6f879b60bef18c4a1b60 Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Tue, 15 Nov 2022 17:21:30 -0600 Subject: [PATCH 1/6] Upgrade devcontainer to GHC 9.2.5 --- .devcontainer/compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/compose.yaml b/.devcontainer/compose.yaml index 2225809..e2e07f4 100644 --- a/.devcontainer/compose.yaml +++ b/.devcontainer/compose.yaml @@ -1,7 +1,7 @@ services: devcontainer: command: sh -c 'while sleep 1; do :; done' - image: public.ecr.aws/v6m6o3k4/haskell:9.2.4-a853e18e0505bc9590dd6eaa31231ae2610fbfa8 + image: public.ecr.aws/acilearning/haskell:9.2.5-7bd251ac55c29968002b10e3d012562e86d3f218 init: true volumes: - ..:/workspaces/witch From b545f81541560fb399f717957131f1191f0b6d69 Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Tue, 15 Nov 2022 17:21:45 -0600 Subject: [PATCH 2/6] Upgrade CI to GHC 9.2.5 --- .github/workflows/workflow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 1c4326a..d11af00 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -39,7 +39,7 @@ jobs: matrix: include: - { platform: ubuntu, ghc: 9.4.2 } - - { platform: ubuntu, ghc: 9.2.4 } + - { platform: ubuntu, ghc: 9.2.5 } - { platform: ubuntu, ghc: 9.0.2 } - { platform: macos, ghc: 9.4.2 } - { platform: windows, ghc: 9.4.2 } From 845980c7b4aaa915c044ecf1b9a6bf813c0cd2c8 Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Tue, 15 Nov 2022 17:22:07 -0600 Subject: [PATCH 3/6] Upgrade CI to GHC 9.4.3 --- .github/workflows/workflow.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index d11af00..6b20d30 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -38,11 +38,11 @@ jobs: strategy: matrix: include: - - { platform: ubuntu, ghc: 9.4.2 } + - { platform: ubuntu, ghc: 9.4.3 } - { platform: ubuntu, ghc: 9.2.5 } - { platform: ubuntu, ghc: 9.0.2 } - - { platform: macos, ghc: 9.4.2 } - - { platform: windows, ghc: 9.4.2 } + - { platform: macos, ghc: 9.4.3 } + - { platform: windows, ghc: 9.4.3 } - { platform: ubuntu, ghc: 8.10.7 } - { platform: ubuntu, ghc: 8.8.4 } - { platform: ubuntu, ghc: 8.6.5 } @@ -116,10 +116,10 @@ jobs: with: asset_content_type: application/gzip asset_name: witch-${{ github.event.release.tag_name }}.tar.gz - asset_path: artifact/ubuntu-9.4.2/witch-${{ github.event.release.tag_name }}.tar.gz + asset_path: artifact/ubuntu-9.4.3/witch-${{ github.event.release.tag_name }}.tar.gz upload_url: ${{ github.event.release.upload_url }} - - run: cabal upload --publish --username '${{ secrets.HACKAGE_USERNAME }}' --password '${{ secrets.HACKAGE_PASSWORD }}' artifact/ubuntu-9.4.2/witch-${{ github.event.release.tag_name }}.tar.gz + - run: cabal upload --publish --username '${{ secrets.HACKAGE_USERNAME }}' --password '${{ secrets.HACKAGE_PASSWORD }}' artifact/ubuntu-9.4.3/witch-${{ github.event.release.tag_name }}.tar.gz i386: runs-on: ubuntu-latest From 731ca19da244c401dabe005ea86c1c0e90bf0d76 Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Tue, 15 Nov 2022 17:23:16 -0600 Subject: [PATCH 4/6] Remove unnecessary output --- .github/workflows/workflow.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 6b20d30..e3362d5 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -65,8 +65,6 @@ jobs: with: ghc-version: ${{ matrix.ghc }} - - run: ghc-pkg list - - run: cabal configure --enable-tests --flags pedantic --jobs - run: cat cabal.project.local From b974985745b1d36b5cac7a362822d745bbc7ee05 Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Tue, 15 Nov 2022 17:23:44 -0600 Subject: [PATCH 5/6] Simplify Git ignore --- .gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7551cda..77f582e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ /.vscode/ -/cabal.project.freeze -/cabal.project.local* +/cabal.project.* /dist-newstyle/ From 79f11ee9ec1694063908c0f75bea798bb28ee8d8 Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Tue, 15 Nov 2022 20:16:19 -0600 Subject: [PATCH 6/6] Revert "Upgrade CI to GHC 9.4.3" This reverts commit 845980c7b4aaa915c044ecf1b9a6bf813c0cd2c8. --- .github/workflows/workflow.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index e3362d5..4998d69 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -38,11 +38,11 @@ jobs: strategy: matrix: include: - - { platform: ubuntu, ghc: 9.4.3 } + - { platform: ubuntu, ghc: 9.4.2 } - { platform: ubuntu, ghc: 9.2.5 } - { platform: ubuntu, ghc: 9.0.2 } - - { platform: macos, ghc: 9.4.3 } - - { platform: windows, ghc: 9.4.3 } + - { platform: macos, ghc: 9.4.2 } + - { platform: windows, ghc: 9.4.2 } - { platform: ubuntu, ghc: 8.10.7 } - { platform: ubuntu, ghc: 8.8.4 } - { platform: ubuntu, ghc: 8.6.5 } @@ -114,10 +114,10 @@ jobs: with: asset_content_type: application/gzip asset_name: witch-${{ github.event.release.tag_name }}.tar.gz - asset_path: artifact/ubuntu-9.4.3/witch-${{ github.event.release.tag_name }}.tar.gz + asset_path: artifact/ubuntu-9.4.2/witch-${{ github.event.release.tag_name }}.tar.gz upload_url: ${{ github.event.release.upload_url }} - - run: cabal upload --publish --username '${{ secrets.HACKAGE_USERNAME }}' --password '${{ secrets.HACKAGE_PASSWORD }}' artifact/ubuntu-9.4.3/witch-${{ github.event.release.tag_name }}.tar.gz + - run: cabal upload --publish --username '${{ secrets.HACKAGE_USERNAME }}' --password '${{ secrets.HACKAGE_PASSWORD }}' artifact/ubuntu-9.4.2/witch-${{ github.event.release.tag_name }}.tar.gz i386: runs-on: ubuntu-latest