Skip to content

Commit

Permalink
Update CI setup
Browse files Browse the repository at this point in the history
Signed-off-by: falkTX <[email protected]>
  • Loading branch information
falkTX committed Sep 30, 2024
1 parent e21da65 commit 344014b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ on:
branches:
- '*'
env:
CACHE_VERSION: 20230704
PAWPAW_VERSION: 6a3c6a65a89abe221858c3f7635140074506bfc3
CACHE_VERSION: 20240930
PAWPAW_VERSION: a9ab736dc297b2055536c71cddf1c79711d420bb
PAWPAW_SKIP_LTO: 1
PAWPAW_SKIP_GLIB: 1
PAWPAW_SKIP_LV2: 1
Expand All @@ -19,13 +19,13 @@ jobs:
strategy:
matrix:
target: [intel, universal]
runs-on: macos-11
runs-on: macos-12
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/PawPawBuilds
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
shell: bash
run: |
./macosx/generate-pkg.sh $(pwd)/destdir/usr/local ${{ github.event.pull_request.number || env.SHA8 }}
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: jack2-macOS-${{ matrix.target }}-${{ github.event.pull_request.number || env.SHA8 }}
path: macosx/jack2-osx-*.pkg
Expand All @@ -69,11 +69,11 @@ jobs:
target: [win32, win64]
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/PawPawBuilds
Expand Down Expand Up @@ -163,7 +163,7 @@ jobs:
echo "#define VERSION \"${{ github.event.pull_request.number || env.SHA8 }}\"" > version.iss
xvfb-run wine ${WINEPREFIX}/drive_c/InnoSeup/ISCC.exe ${{ matrix.target }}-mini.iss
popd
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: jack2-${{ matrix.target }}-${{ github.event.pull_request.number || env.SHA8 }}
path: windows/inno/jack2-*.exe
7 changes: 3 additions & 4 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,12 @@ on:

jobs:
build:

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install flake8 findutils
sudo apt-get update -qq
sudo apt-get install -qqy flake8 findutils
- name: Lint with flake8
run: find . -type f \( -iname wscript -or -iname jack_control \) -exec flake8 {} \;

0 comments on commit 344014b

Please sign in to comment.