diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fdd9226..86e0e5f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,12 +14,12 @@ jobs: steps: - name: Extract the tested GHC versions id: set-matrix - uses: kleidukos/get-tested@e043bd97035b89e378860d91bbce6a56b83133c5 + uses: kleidukos/get-tested@0.1.7.1 with: cabal-file: get-tested.cabal - ubuntu-version: latest + ubuntu-version: 'latest' macos-version: 'latest' - version: 0.1.7.1 + version: 0.1.7.0 build: name: ${{ matrix.ghc }} on ${{ matrix.os }} needs: generate-matrix @@ -47,7 +47,7 @@ jobs: run: | ARCHITECTURE=$(uname -m) echo "ARCH=$ARCHITECTURE" >> $GITHUB_ENV - echo "REPORT_NAME=report-${{ matrix.os }}-ghc-${{ matrix.ghc }}.xml" >> $GITHUB_ENV + echo "REPORT_NAME=report-${{ runner.os }}-ghc-${{ matrix.ghc }}.xml" >> $GITHUB_ENV - name: Freeze run: cabal freeze --project-file=cabal.release.project @@ -87,19 +87,15 @@ jobs: - name: Package the get-tested executable run: | - GETTESTED_EXEC=distribution/get-tested - ARTIFACT_NAME="get-tested-head-${{ env.KERNEL }}-${{ env.ARCH }}" + executable=distribution/get-tested + ARTIFACT_NAME="get-tested-head-${{ runner.os }}-${{ env.ARCH }}" echo "ARTIFACT_NAME=${ARTIFACT_NAME}" >> $GITHUB_ENV - ARCHIVE=${ARTIFACT_NAME}.tar.gz - DIR=$(dirname $GETTESTED_EXEC) - FILE=$(basename $GETTESTED_EXEC) - tar -czvf ${ARCHIVE} -C $DIR $FILE - name: Upload the get-tested executable uses: actions/upload-artifact@v4 with: name: ${{ env.ARTIFACT_NAME }} - path: ${{ env.ARTIFACT_NAME }}.tar.gz + path: distribution/get-tested build-alpine: name: 9.10.1 on alpine-3.20 @@ -128,8 +124,6 @@ jobs: run: | ARCHITECTURE=$(uname -m) echo "ARCH=$ARCHITECTURE" >> $GITHUB_ENV - KERNEL=$(uname -m) - echo "KERNEL=$KERNEL" >> $GITHUB_ENV echo "REPORT_NAME=report-alpine.xml" >> $GITHUB_ENV - name: Freeze @@ -162,9 +156,6 @@ jobs: mkdir distribution cp ${bin} distribution/get-tested - - name: File type - run: file distribution/get-tested - - name: Post-process executables run: | strip distribution/get-tested @@ -173,18 +164,14 @@ jobs: - name: Tar get-tested executable run: | GETTESTED_EXEC=distribution/get-tested - ARTIFACT_NAME="get-tested-head-${{ env.KERNEL }}-static-${{ env.ARCH }}" + ARTIFACT_NAME="get-tested-head-${{ runner.os }}-static-${{ env.ARCH }}" echo "ARTIFACT_NAME=${ARTIFACT_NAME}" >> $GITHUB_ENV - ARCHIVE=${ARTIFACT_NAME}.tar.gz - DIR=$(dirname $GETTESTED_EXEC) - FILE=$(basename $GETTESTED_EXEC) - tar -czvf ${ARCHIVE} -C $DIR $FILE - name: Upload get-tested executable to workflow artifacts uses: actions/upload-artifact@v4 with: name: ${{ env.ARTIFACT_NAME }} - path: ${{ env.ARTIFACT_NAME }}.tar.gz + path: distribution/get-tested collect-test-results: name: Collect test results @@ -231,6 +218,5 @@ jobs: uses: softprops/action-gh-release@v2 with: prerelease: true - draft: true files: ./out/* tag_name: get-tested-head diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 424eb2f..5fd4408 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -48,8 +48,7 @@ jobs: run: | ARCHITECTURE=$(uname -m) echo "ARCH=$ARCHITECTURE" >> $GITHUB_ENV - echo "REPORT_NAME=report-${{ matrix.os }}-ghc-$(uname -m).xml" >> $GITHUB_ENV - echo ${{ env.ARCH }} + echo "REPORT_NAME=report-${{ runner.os }}-ghc-${{ matrix.ghc }}.xml" >> $GITHUB_ENV - name: Freeze run: cabal freeze --project-file=cabal.release.project @@ -94,13 +93,9 @@ jobs: - name: Package the get-tested executable run: | - GETTESTED_EXEC=distribution/get-tested + executable=distribution/get-tested ARTIFACT_NAME="get-tested-${{ env.VERSION }}-${{ runner.os }}-${{ env.ARCH }}" echo "ARTIFACT_NAME=${ARTIFACT_NAME}" >> $GITHUB_ENV - ARCHIVE=${ARTIFACT_NAME}.tar.gz - DIR=$(dirname $GETTESTED_EXEC) - FILE=$(basename $GETTESTED_EXEC) - tar -czvf ${ARCHIVE} -C $DIR $FILE - name: Upload the get-tested executable uses: actions/upload-artifact@v4 @@ -139,7 +134,7 @@ jobs: run: | ARCHITECTURE=$(uname -m) echo "ARCH=$ARCHITECTURE" >> $GITHUB_ENV - echo "REPORT_NAME=report-alpine-3.20-ghc-$(uname -m).xml" >> $GITHUB_ENV + echo "REPORT_NAME=report-alpine-ghc-$(uname -m).xml" >> $GITHUB_ENV echo ${{ env.ARCH }} - name: Freeze @@ -191,16 +186,12 @@ jobs: GETTESTED_EXEC=distribution/get-tested ARTIFACT_NAME="get-tested-${{ env.VERSION }}-${{ runner.os }}-static-${{ env.ARCH }}" echo "ARTIFACT_NAME=${ARTIFACT_NAME}" >> $GITHUB_ENV - ARCHIVE=${ARTIFACT_NAME}.tar.gz - DIR=$(dirname $GETTESTED_EXEC) - FILE=$(basename $GETTESTED_EXEC) - tar -czvf ${ARCHIVE} -C $DIR $FILE - name: Upload get-tested executable to workflow artifacts uses: actions/upload-artifact@v4 with: name: ${{ env.ARTIFACT_NAME }} - path: ${{ env.ARTIFACT_NAME }}.tar.gz + path: distribution/get-tested collect-test-results: name: Collect test results diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d5da3d..e3f81fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## 0.1.8.1 -- 2024-09-13 + +* Fix the setup action + ## 0.1.8.0 -- 2024-09-06 * Provide the `--newest` and `--oldest` flags to pick the newest or oldest-supported GHC. ([55](https://github.com/Kleidukos/get-tested/pull/55)) diff --git a/get-tested.cabal b/get-tested.cabal index e94608b..323361d 100644 --- a/get-tested.cabal +++ b/get-tested.cabal @@ -1,6 +1,6 @@ cabal-version: 3.4 name: get-tested -version: 0.1.8.0 +version: 0.1.8.1 synopsis: Get the tested-with stanza of your Cabal file -- description: