Skip to content

Commit

Permalink
squash! attempt to use local actions
Browse files Browse the repository at this point in the history
Merge branch 'master' into validate-actions
  • Loading branch information
geekosaur committed Dec 20, 2024
2 parents d2f7795 + fc186ef commit a4659da
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 17 deletions.
10 changes: 0 additions & 10 deletions .github/actions/cabal-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
5 changes: 0 additions & 5 deletions .github/actions/dogfooding/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/prerelease-head.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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-*
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prerelease-lts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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-*
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,12 @@ jobs:
- run: ${{ needs.config.outputs.env }}
shell: bash

- uses: actions/download-artifact@v4
with:
pattern: cabal-*
path: binaries
merge-multiple: true

- uses: actions/checkout@v4

- uses: ./.github/actions/validate-old
Expand Down

0 comments on commit a4659da

Please sign in to comment.