From 9231602c9b9e0d396d36759fa037383d7aa351a1 Mon Sep 17 00:00:00 2001 From: Matthew Keeler Date: Mon, 12 Aug 2024 14:07:15 -0400 Subject: [PATCH 1/9] Update LD actions --- .github/actions/publish-docs/action.yml | 2 +- .github/workflows/manual-publish.yml | 2 +- .github/workflows/release-please.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/publish-docs/action.yml b/.github/actions/publish-docs/action.yml index 00d6bd6..cc53349 100644 --- a/.github/actions/publish-docs/action.yml +++ b/.github/actions/publish-docs/action.yml @@ -12,7 +12,7 @@ runs: shell: bash run: echo "STACK_DIR=$(stack --no-terminal path --dist-dir)" >> $GITHUB_ENV - - uses: launchdarkly/gh-actions/actions/publish-pages@publish-pages-v1.0.1 + - uses: launchdarkly/gh-actions/actions/publish-pages@publish-pages-v1.0.2 name: 'Publish to Github pages' with: docs_path: ${{env.STACK_DIR}}/doc/html/launchdarkly-server-sdk/ diff --git a/.github/workflows/manual-publish.yml b/.github/workflows/manual-publish.yml index 05c6563..3251720 100644 --- a/.github/workflows/manual-publish.yml +++ b/.github/workflows/manual-publish.yml @@ -28,7 +28,7 @@ jobs: with: token: ${{secrets.GITHUB_TOKEN}} - - uses: launchdarkly/gh-actions/actions/release-secrets@release-secrets-v1.0.0 + - uses: launchdarkly/gh-actions/actions/release-secrets@release-secrets-v1.2.0 name: 'Get Hackage token' with: aws_assume_role: ${{ vars.AWS_ROLE_ARN }} diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 4bd7c43..e30c0e7 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -41,7 +41,7 @@ jobs: # # These remaining steps are ONLY run if a release was actually created # - - uses: launchdarkly/gh-actions/actions/release-secrets@release-secrets-v1.0.0 + - uses: launchdarkly/gh-actions/actions/release-secrets@release-secrets-v1.2.0 name: 'Get Hackage token' if: ${{ steps.release.outputs.releases_created }} with: From 186cdb64a114a0c368f39f1156b47151a26e7e96 Mon Sep 17 00:00:00 2001 From: Matthew Keeler Date: Mon, 12 Aug 2024 14:07:34 -0400 Subject: [PATCH 2/9] Update provenance --- .github/workflows/manual-publish.yml | 2 +- .github/workflows/release-please.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/manual-publish.yml b/.github/workflows/manual-publish.yml index 3251720..7073386 100644 --- a/.github/workflows/manual-publish.yml +++ b/.github/workflows/manual-publish.yml @@ -46,7 +46,7 @@ jobs: actions: read id-token: write contents: write - uses: slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v1.10.0 + uses: slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v2.0.0 with: base64-subjects: "${{ needs.build-publish.outputs.package-hashes }}" upload-assets: ${{ !inputs.dry_run }} diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index e30c0e7..09db61d 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -80,7 +80,7 @@ jobs: actions: read id-token: write contents: write - uses: slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v1.10.0 + uses: slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v2.0.0 with: base64-subjects: "${{ needs.release-package.outputs.package-hashes }}" upload-assets: true From 2bbf9ea14a820c81264bd85ee0ffa9a2ef8b6932 Mon Sep 17 00:00:00 2001 From: Matthew Keeler Date: Mon, 12 Aug 2024 14:07:51 -0400 Subject: [PATCH 3/9] Update release-please --- .github/workflows/release-please.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 09db61d..d8085f1 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -19,12 +19,8 @@ jobs: package-hashes: ${{ steps.ci.outputs.package-hashes }} steps: - - uses: google-github-actions/release-please-action@v3 + - uses: googleapis/release-please-action@v4 id: release - with: - command: manifest - token: ${{secrets.GITHUB_TOKEN}} - default-branch: main - uses: actions/checkout@v4 with: From 38d7a88b81b7307c94826fd342663efb832c1207 Mon Sep 17 00:00:00 2001 From: Matthew Keeler Date: Mon, 12 Aug 2024 16:07:27 -0400 Subject: [PATCH 4/9] Fix comparison --- .github/workflows/release-please.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index d8085f1..a60f177 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -39,31 +39,31 @@ jobs: # - uses: launchdarkly/gh-actions/actions/release-secrets@release-secrets-v1.2.0 name: 'Get Hackage token' - if: ${{ steps.release.outputs.releases_created }} + if: ${{ steps.release.outputs.releases_created == 'true' }} with: aws_assume_role: ${{ vars.AWS_ROLE_ARN }} ssm_parameter_pairs: '/production/common/releasing/hackage/password = HACKAGE_TOKEN' - uses: ./.github/actions/setup-cache - if: ${{ steps.release.outputs.releases_created }} + if: ${{ steps.release.outputs.releases_created == 'true' }} - uses: ./.github/actions/ci id: ci - if: ${{ steps.release.outputs.releases_created }} + if: ${{ steps.release.outputs.releases_created == 'true' }} with: token: ${{secrets.GITHUB_TOKEN}} - uses: ./.github/actions/build-docs - if: ${{ steps.release.outputs.releases_created }} + if: ${{ steps.release.outputs.releases_created == 'true' }} - uses: ./.github/actions/publish - if: ${{ steps.release.outputs.releases_created }} + if: ${{ steps.release.outputs.releases_created == 'true' }} with: token: ${{ env.HACKAGE_TOKEN }} dry_run: 'false' - uses: ./.github/actions/publish-docs - if: ${{ steps.release.outputs.releases_created }} + if: ${{ steps.release.outputs.releases_created == 'true' }} with: # If publishing somewhere else, then get the token from SSM. If you need both github, # and another token, then add more tokens to the composite action. @@ -71,7 +71,7 @@ jobs: release-provenance: needs: [ 'release-package' ] - if: ${{ needs.release-package.outputs.release-created }} + if: ${{ needs.release-package.outputs.release-created == 'true' }} permissions: actions: read id-token: write From bd03ab6f622e0444f0b69e1f9bab1b883b016cba Mon Sep 17 00:00:00 2001 From: Matthew Keeler Date: Tue, 13 Aug 2024 12:43:22 -0400 Subject: [PATCH 5/9] Version bump? --- .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 2519348..89419ed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: ghc-version: 8.10.7 - resolver: lts-19.33 ghc-version: 9.0.2 - - resolver: lts-20.11 + - resolver: lts-20.26 ghc-version: 9.2.5 steps: @@ -50,7 +50,7 @@ jobs: ghc-version: 8.10.7 - resolver: lts-19.33 ghc-version: 9.0.2 - - resolver: lts-20.11 + - resolver: lts-20.26 ghc-version: 9.2.5 steps: From 097b89a625575c2cd39383e5f6d80218166c071d Mon Sep 17 00:00:00 2001 From: Matthew Keeler Date: Tue, 13 Aug 2024 13:55:12 -0400 Subject: [PATCH 6/9] take out llvm --- .github/workflows/ci.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 89419ed..0ddfdc3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,10 +48,13 @@ jobs: include: - resolver: lts-18.28 ghc-version: 8.10.7 + use-llvm: 'true' - resolver: lts-19.33 ghc-version: 9.0.2 + use-llvm: 'true' - resolver: lts-20.26 ghc-version: 9.2.5 + use-llvm: 'false' steps: - uses: actions/checkout@v4 @@ -61,10 +64,12 @@ jobs: - name: Install os dependencies run: brew install pcre llvm@13 - - name: Setup compilation environment - run: | - echo "C_INCLUDE_PATH=$(find /opt/homebrew/Cellar/pcre -name 'pcre.h' -exec dirname {} \;):$(xcrun --show-sdk-path)/usr/include/ffi" >> $GITHUB_ENV - echo "PATH=/opt/homebrew/opt/llvm@13/bin:$PATH" >> $GITHUB_ENV + - name: Setup C_INCLUDE_PATH + run: echo "C_INCLUDE_PATH=$(find /opt/homebrew/Cellar/pcre -name 'pcre.h' -exec dirname {} \;):$(xcrun --show-sdk-path)/usr/include/ffi" >> $GITHUB_ENV + + - name: Add LLVM to path + if: ${{ matrix.use-llvm == 'true' }} + run: echo "PATH=/opt/homebrew/opt/llvm@13/bin:$PATH" >> $GITHUB_ENV - uses: ./.github/actions/setup-cache with: From 34feb659332e8560840bb9d92e49abc3fc697ff9 Mon Sep 17 00:00:00 2001 From: Matthew Keeler Date: Tue, 13 Aug 2024 14:10:21 -0400 Subject: [PATCH 7/9] Bump more actions --- .github/actions/setup-cache/action.yml | 6 +++--- .github/actions/update-cabal/action.yml | 2 +- .github/workflows/ci.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/setup-cache/action.yml b/.github/actions/setup-cache/action.yml index ca6df3a..7b757a6 100644 --- a/.github/actions/setup-cache/action.yml +++ b/.github/actions/setup-cache/action.yml @@ -9,7 +9,7 @@ inputs: runs: using: composite steps: - - uses: actions/cache@v3 + - uses: actions/cache@v4 name: Cache ~/.stack with: path: ~/.stack @@ -17,7 +17,7 @@ runs: restore-keys: | ${{ runner.os }}-stack-global- - - uses: actions/cache@v3 + - uses: actions/cache@v4 name: Cache .stack-work with: path: .stack-work @@ -26,7 +26,7 @@ runs: ${{ runner.os }}-stack-work- - name: Cache ~/.cabal/packages, ~/.cabal/store and dist-newstyle - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.cabal/packages diff --git a/.github/actions/update-cabal/action.yml b/.github/actions/update-cabal/action.yml index a7185b2..34e96ed 100644 --- a/.github/actions/update-cabal/action.yml +++ b/.github/actions/update-cabal/action.yml @@ -17,7 +17,7 @@ runs: ghc-version: ${{ inputs.ghc-version }} - name: Cache ~/.cabal/packages, ~/.cabal/store and dist-newstyle - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.cabal/packages diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0ddfdc3..c817990 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -107,7 +107,7 @@ jobs: with: fail-on: warning - - uses: haskell-actions/run-fourmolu@v9 + - uses: haskell-actions/run-fourmolu@v10 with: version: "0.10.1.0" pattern: | From b1afd2645310d48039de0f619980501878664e1c Mon Sep 17 00:00:00 2001 From: Matthew Keeler Date: Tue, 13 Aug 2024 14:14:46 -0400 Subject: [PATCH 8/9] llvm 13 -> nil --- .github/workflows/ci.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c817990..ced8ebc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,15 +61,16 @@ jobs: with: fetch-depth: 0 # If you only need the current version keep this. - - name: Install os dependencies - run: brew install pcre llvm@13 - - name: Setup C_INCLUDE_PATH - run: echo "C_INCLUDE_PATH=$(find /opt/homebrew/Cellar/pcre -name 'pcre.h' -exec dirname {} \;):$(xcrun --show-sdk-path)/usr/include/ffi" >> $GITHUB_ENV + run: | + brew install pcre + echo "C_INCLUDE_PATH=$(find /opt/homebrew/Cellar/pcre -name 'pcre.h' -exec dirname {} \;):$(xcrun --show-sdk-path)/usr/include/ffi" >> $GITHUB_ENV - name: Add LLVM to path if: ${{ matrix.use-llvm == 'true' }} - run: echo "PATH=/opt/homebrew/opt/llvm@13/bin:$PATH" >> $GITHUB_ENV + run: | + brew install llvm@13 + echo "PATH=/opt/homebrew/opt/llvm@13/bin:$PATH" >> $GITHUB_ENV - uses: ./.github/actions/setup-cache with: From ab86de1cfc989f17e727b3afc5bbd1ab32f7125f Mon Sep 17 00:00:00 2001 From: Matthew Keeler Date: Tue, 13 Aug 2024 14:53:22 -0400 Subject: [PATCH 9/9] try llvm@14 --- .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 ced8ebc..1d814bd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,8 +69,8 @@ jobs: - name: Add LLVM to path if: ${{ matrix.use-llvm == 'true' }} run: | - brew install llvm@13 - echo "PATH=/opt/homebrew/opt/llvm@13/bin:$PATH" >> $GITHUB_ENV + brew install llvm@14 + echo "PATH=/opt/homebrew/opt/llvm@14/bin:$PATH" >> $GITHUB_ENV - uses: ./.github/actions/setup-cache with: