Skip to content

Commit

Permalink
Update PawPaw and do initial bootstrap push
Browse files Browse the repository at this point in the history
Signed-off-by: falkTX <falktx@falktx.com>
  • Loading branch information
falkTX committed Jan 10, 2022
1 parent 02f8f11 commit 1c2ad34
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 42 deletions.
83 changes: 42 additions & 41 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ on:
branches:
- '*'
env:
BOOTSTRAP_VERSION: 1
CACHE_VERSION: 1
DEBIAN_FRONTEND: noninteractive
HOMEBREW_NO_AUTO_UPDATE: 1
PAWPAW_SKIP_LTO: 1

jobs:
# macOS native intel build
Expand All @@ -25,7 +26,7 @@ jobs:
with:
path: |
~/PawPawBuilds
key: cache-macos
key: macos-v${{ env.CACHE_VERSION }}
- name: Set up dependencies
run: |
brew install cmake jq meson
Expand All @@ -47,7 +48,7 @@ jobs:

# macOS native universal build
macos_universal:
runs-on: macos-latest
runs-on: macos-10.15
steps:
- uses: actions/checkout@v2
with:
Expand All @@ -57,7 +58,7 @@ jobs:
with:
path: |
~/PawPawBuilds
key: cache-macos-universal
key: macos-universal-v${{ env.CACHE_VERSION }}
- name: Set up dependencies
run: |
brew install cmake jq meson
Expand All @@ -69,17 +70,17 @@ jobs:
shell: bash
run: |
./PawPaw/bootstrap-jack2.sh macos-universal && ./PawPaw/bootstrap-qt.sh macos-universal && ./PawPaw/.cleanup.sh macos-universal
- name: Build macOS universal
shell: bash
run: |
./pack-jack2-version.sh macos-universal
- name: Set sha8
id: slug
run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
- uses: actions/upload-artifact@v2
with:
name: jack2-macOS-universal-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
path: PawPaw/jack2-macOS-*.tar.gz
#- name: Build macOS universal
#shell: bash
#run: |
#./pack-jack2-version.sh macos-universal
#- name: Set sha8
#id: slug
#run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
#- uses: actions/upload-artifact@v2
#with:
#name: jack2-macOS-universal-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
#path: PawPaw/jack2-macOS-*.tar.gz

# linux with win32 cross-compilation
win32:
Expand All @@ -93,7 +94,7 @@ jobs:
with:
path: |
~/PawPawBuilds
key: cache-win32
key: win32-v${{ env.CACHE_VERSION }}
- name: Restore debian packages cache
run: |
if [ -d ~/PawPawBuilds/debs ] && [ "$(ls ~/PawPawBuilds/debs | wc -l)" -ne 0 ]; then \
Expand All @@ -103,7 +104,7 @@ jobs:
run: |
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
sudo apt-get update -qq
sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal
sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
- name: Set up dependencies
run: |
sudo dpkg --add-architecture i386
Expand All @@ -118,17 +119,17 @@ jobs:
shell: bash
run: |
./PawPaw/bootstrap-jack2.sh win32 && ./PawPaw/bootstrap-qt.sh win32 && ./PawPaw/.cleanup.sh win32
- name: Build win32 cross-compiled
shell: bash
run: |
xvfb-run ./pack-jack2-version.sh win32
- name: Set sha8
id: slug
run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
- uses: actions/upload-artifact@v2
with:
name: jack2-win32-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
path: PawPaw/jack2-win*.exe
#- name: Build win32 cross-compiled
#shell: bash
#run: |
#xvfb-run ./pack-jack2-version.sh win32
#- name: Set sha8
#id: slug
#run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
#- uses: actions/upload-artifact@v2
#with:
#name: jack2-win32-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
#path: PawPaw/jack2-win*.exe

# linux with win64 cross-compilation
win64:
Expand All @@ -142,7 +143,7 @@ jobs:
with:
path: |
~/PawPawBuilds
key: cache-win64
key: win64-v${{ env.CACHE_VERSION }}
- name: Restore debian packages cache
run: |
if [ -d ~/PawPawBuilds/debs ] && [ "$(ls ~/PawPawBuilds/debs | wc -l)" -ne 0 ]; then \
Expand All @@ -152,7 +153,7 @@ jobs:
run: |
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
sudo apt-get update -qq
sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal
sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
- name: Set up dependencies
run: |
sudo dpkg --add-architecture i386
Expand All @@ -167,14 +168,14 @@ jobs:
shell: bash
run: |
./PawPaw/bootstrap-jack2.sh win64 && ./PawPaw/bootstrap-qt.sh win64 && ./PawPaw/.cleanup.sh win64
- name: Build win64 cross-compiled
shell: bash
run: |
xvfb-run ./pack-jack2-version.sh win64
- name: Set sha8
id: slug
run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
- uses: actions/upload-artifact@v2
with:
name: jack2-win64-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
path: PawPaw/jack2-win*.exe
#- name: Build win64 cross-compiled
#shell: bash
#run: |
#xvfb-run ./pack-jack2-version.sh win64
#- name: Set sha8
#id: slug
#run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
#- uses: actions/upload-artifact@v2
#with:
#name: jack2-win64-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
#path: PawPaw/jack2-win*.exe

0 comments on commit 1c2ad34

Please sign in to comment.