Skip to content

Commit

Permalink
CI cleanup
Browse files Browse the repository at this point in the history
Signed-off-by: falkTX <[email protected]>
  • Loading branch information
falkTX committed Oct 17, 2023
1 parent 7202b11 commit a25535d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
tar chJf mod-app-${{ github.event.pull_request.number || env.SHA8 }}-linux-x86_64.tar.xz mod-app-${{ github.event.pull_request.number || env.SHA8 }}-linux-x86_64
- uses: actions/upload-artifact@v3
with:
name: ${{ github.event.repository.name }}-win64-${{ github.event.pull_request.number || env.SHA8 }}
name: mod-app-${{ github.event.pull_request.number || env.SHA8 }}-linux-x86_64
path: |
*.tar.xz
Expand All @@ -65,7 +65,7 @@ jobs:
echo "SHA8=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV
- name: Set up dependencies
run: |
brew install autoconf automake cmake gnu-sed make meson
brew install autoconf automake cmake gawk gnu-sed make meson
- name: Build dependencies
run: |
./PawPaw/bootstrap-mod.sh macos-universal-10.15 && ./PawPaw/.cleanup.sh macos-universal-10.15
Expand All @@ -80,7 +80,7 @@ jobs:
mv mod-app-*.dmg mod-app-${{ github.event.pull_request.number || env.SHA8 }}-macOS.dmg
- uses: actions/upload-artifact@v3
with:
name: ${{ github.event.repository.name }}-macOS-${{ github.event.pull_request.number || env.SHA8 }}
name: mod-app-${{ github.event.pull_request.number || env.SHA8 }}-macOS
path: |
*.dmg
Expand Down Expand Up @@ -122,6 +122,6 @@ jobs:
mv mod-app-*.exe mod-app-${{ github.event.pull_request.number || env.SHA8 }}-win64.exe
- uses: actions/upload-artifact@v3
with:
name: ${{ github.event.repository.name }}-win64-${{ github.event.pull_request.number || env.SHA8 }}
name: mod-app-${{ github.event.pull_request.number || env.SHA8 }}-win64
path: |
*.exe
2 changes: 1 addition & 1 deletion utils/plugin-builder.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export PAWPAW_PREFIX
export TOOLCHAIN_PREFIX

if [ "${MACOS}" -eq 1 ]; then
export PATH="${PAWPAW_PREFIX}-host/bin:${PATH}"
export PATH="${PAWPAW_PREFIX}-host/bin:/usr/local/opt/coreutils/bin:${PATH}"
fi

make -f utils/plugin-builder.mk pkgname="${plugin}" ${MAKE_ARGS} PREFIX=/usr WITH_LTO=false VERBOSE=1
Expand Down

0 comments on commit a25535d

Please sign in to comment.