diff --git a/.github/actions/cabal-setup/action.yml b/.github/actions/cabal-setup/action.yml index 457194cd2a6..8d10a0e9c2d 100644 --- a/.github/actions/cabal-setup/action.yml +++ b/.github/actions/cabal-setup/action.yml @@ -133,16 +133,6 @@ runs: fi echo "FLAGS=$FLAGS" >> "$GITHUB_ENV" - - name: Validate print-config - shell: ${{ inputs.shell }} - run: | - sh validate.sh $FLAGS -s print-config - - - name: Validate print-tool-versions - shell: ${{ inputs.shell }} - run: | - sh validate.sh $FLAGS -s print-tool-versions - - name: Canonicalize architecture shell: ${{ inputs.shell }} run: | diff --git a/.github/actions/dogfooding/action.yml b/.github/actions/dogfooding/action.yml index c0cb7f437e4..d28ac2dbab9 100644 --- a/.github/actions/dogfooding/action.yml +++ b/.github/actions/dogfooding/action.yml @@ -39,11 +39,6 @@ runs: run: | tar -xzf "./cabal-head/cabal-head-${{ runner.os }}-$CABAL_ARCH.tar.gz" -C cabal-head - - name: print-config using cabal HEAD - shell: ${{ inputs.shell }} - run: | - sh validate.sh $COMMON_FLAGS --with-cabal ./cabal-head/cabal -s print-config - - name: Build using cabal HEAD shell: ${{ inputs.shell }} run: | diff --git a/.github/workflows/prerelease-head.yml b/.github/workflows/prerelease-head.yml index be721ffe4c1..1ee07dce5db 100644 --- a/.github/workflows/prerelease-head.yml +++ b/.github/workflows/prerelease-head.yml @@ -122,7 +122,6 @@ jobs: release_name: 'cabal-head' token: ${{ github.token }} - # for now this is hardcoded. is there a better way? - uses: actions/download-artifact@v4 with: pattern: cabal-* diff --git a/.github/workflows/prerelease-lts.yml b/.github/workflows/prerelease-lts.yml index 71fdd718045..6cfe55eab12 100644 --- a/.github/workflows/prerelease-lts.yml +++ b/.github/workflows/prerelease-lts.yml @@ -122,8 +122,8 @@ jobs: - uses: liudonghua123/delete-release-action@v1 with: release_name: 'cabal-head' + token: ${{ github.token }} - # for now this is hardcoded. is there a better way? - uses: actions/download-artifact@v4 with: pattern: cabal-* diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index e38d5b0b28d..f27f901dfa8 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -342,6 +342,16 @@ jobs: - run: ${{ needs.config.outputs.env }} shell: bash + - uses: liudonghua123/delete-release-action@v1 + with: + release_name: 'cabal-head' + + - uses: actions/download-artifact@v4 + with: + pattern: cabal-* + path: binaries + merge-multiple: true + - uses: actions/checkout@v4 - uses: ./.github/actions/validate-old