Christian Clauss GitHub 2 years ago
parent
commit
d2d44158f9
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions
  1. +15
    -15
      .github/workflows/build.yml
  2. +1
    -1
      .github/workflows/lint.yml

+ 15
- 15
.github/workflows/build.yml View File

@@ -19,11 +19,11 @@ jobs:
macos: macos:
runs-on: macos-10.15 runs-on: macos-10.15
steps: steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with: with:
submodules: recursive submodules: recursive
- name: Set up cache - name: Set up cache
uses: actions/cache@v2
uses: actions/cache@v3
with: with:
path: | path: |
~/PawPawBuilds ~/PawPawBuilds
@@ -53,7 +53,7 @@ jobs:
shell: bash shell: bash
run: | run: |
./macosx/generate-pkg.sh $(pwd)/destdir/usr/local ${{ github.event.pull_request.number || steps.slug.outputs.sha8 }} ./macosx/generate-pkg.sh $(pwd)/destdir/usr/local ${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with: with:
name: jack2-macOS-intel-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }} name: jack2-macOS-intel-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
path: macosx/jack2-osx-*.pkg path: macosx/jack2-osx-*.pkg
@@ -62,11 +62,11 @@ jobs:
macos_universal: macos_universal:
runs-on: macos-10.15 runs-on: macos-10.15
steps: steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with: with:
submodules: recursive submodules: recursive
- name: Set up cache - name: Set up cache
uses: actions/cache@v2
uses: actions/cache@v3
with: with:
path: | path: |
~/PawPawBuilds ~/PawPawBuilds
@@ -100,7 +100,7 @@ jobs:
shell: bash shell: bash
run: | run: |
./macosx/generate-pkg.sh $(pwd)/destdir/usr/local ${{ github.event.pull_request.number || steps.slug.outputs.sha8 }} ./macosx/generate-pkg.sh $(pwd)/destdir/usr/local ${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with: with:
name: jack2-macOS-universal-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }} name: jack2-macOS-universal-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
path: macosx/jack2-osx-*.pkg path: macosx/jack2-osx-*.pkg
@@ -109,11 +109,11 @@ jobs:
win32: win32:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with: with:
submodules: recursive submodules: recursive
- name: Set up cache - name: Set up cache
uses: actions/cache@v2
uses: actions/cache@v3
with: with:
path: | path: |
~/PawPawBuilds ~/PawPawBuilds
@@ -181,7 +181,7 @@ jobs:
echo "#define VERSION \"${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}\"" > version.iss echo "#define VERSION \"${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}\"" > version.iss
xvfb-run wine ${WINEPREFIX}/drive_c/InnoSeup/ISCC.exe win32-mini.iss xvfb-run wine ${WINEPREFIX}/drive_c/InnoSeup/ISCC.exe win32-mini.iss
popd popd
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with: with:
name: jack2-win32-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }} name: jack2-win32-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
path: windows/inno/jack2-*.exe path: windows/inno/jack2-*.exe
@@ -190,11 +190,11 @@ jobs:
win64: win64:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with: with:
submodules: recursive submodules: recursive
- name: Set up cache - name: Set up cache
uses: actions/cache@v2
uses: actions/cache@v3
with: with:
path: | path: |
~/PawPawBuilds ~/PawPawBuilds
@@ -269,7 +269,7 @@ jobs:
echo "#define VERSION \"${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}\"" > version.iss echo "#define VERSION \"${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}\"" > version.iss
xvfb-run wine64 ${WINEPREFIX}/drive_c/InnoSeup/ISCC.exe win64-mini.iss xvfb-run wine64 ${WINEPREFIX}/drive_c/InnoSeup/ISCC.exe win64-mini.iss
popd popd
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with: with:
name: jack2-win64-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }} name: jack2-win64-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
path: windows/inno/jack2-*.exe path: windows/inno/jack2-*.exe
@@ -278,11 +278,11 @@ jobs:
#ubuntu_20_04: #ubuntu_20_04:
#runs-on: ubuntu-20.04 #runs-on: ubuntu-20.04
#steps: #steps:
#- uses: actions/checkout@v2
#- uses: actions/checkout@v3
#with: #with:
#submodules: recursive #submodules: recursive
#- name: Set up cache #- name: Set up cache
#uses: actions/cache@v2
#uses: actions/cache@v3
#with: #with:
#path: | #path: |
#~/debs #~/debs
@@ -315,7 +315,7 @@ jobs:
#sed -i "s|--prefix=/usr --classic|--prefix=/usr --classic|" debian/rules #sed -i "s|--prefix=/usr --classic|--prefix=/usr --classic|" debian/rules
#dch -M -b -v "$(cat wscript | awk 'sub("^VERSION = ","")' | tr -d "'")~$(date +"%Y%m%d")git${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}" -D focal "automated build" #dch -M -b -v "$(cat wscript | awk 'sub("^VERSION = ","")' | tr -d "'")~$(date +"%Y%m%d")git${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}" -D focal "automated build"
#debuild -rfakeroot --no-lintian || true #debuild -rfakeroot --no-lintian || true
#- uses: actions/upload-artifact@v2
#- uses: actions/upload-artifact@v3
#with: #with:
#name: jack2-ubuntu-20.04-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }} #name: jack2-ubuntu-20.04-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
#path: ~/work/jack2/*.deb #path: ~/work/jack2/*.deb

+ 1
- 1
.github/workflows/lint.yml View File

@@ -13,7 +13,7 @@ jobs:


runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install dependencies - name: Install dependencies
run: | run: |
sudo apt-get update sudo apt-get update


Loading…
Cancel
Save