From 9ab7555faad13e92e5d9fb31ea0c5de67fcdb2a4 Mon Sep 17 00:00:00 2001 From: Eilionoir Tunnicliff Date: Wed, 17 Aug 2022 21:18:37 -0400 Subject: [PATCH] Update branch (#368) * there wasn't cd .. * Start running compile on M1 mini (#367) * Switch to self-hosted runner * Fix name * Fix runner 2 * Update release * Update release.yml * Update release.yml * Fix M1 runner bruh * Fix M1 runner 2 * Update release.yml * Fix yaml * Update release.yml Co-authored-by: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> --- .github/workflows/development.yml | 60 ++++---------------------- .github/workflows/release.yml | 71 ++++++------------------------- Makefile | 1 + 3 files changed, 22 insertions(+), 110 deletions(-) diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml index 96694823..179dc93e 100644 --- a/.github/workflows/development.yml +++ b/.github/workflows/development.yml @@ -6,56 +6,20 @@ on: jobs: build: name: Development build - runs-on: macOS-11 + runs-on: MacStadium steps: - - name: Set up cache - uses: actions/cache@v2 - id: procache - with: - path: | - ~/__cache - key: ${{ runner.os }}-procursus - - - name: Set up build environment - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: '13.2.1' - - - name: Set up build environment pt. II + - name: Checkout repository uses: actions/checkout@v2 - - name: Set up build environment pt. III + - name: Checkout repository submodules run: git submodule update --init --recursive - - - name: Set up build environment pt. IV (Install) - if: steps.procache.outputs.cache-hit != 'true' - run: | - wget https://apt.procurs.us/bootstrap_darwin-amd64.tar.zst - sudo gtar --preserve-permissions -xkf ./bootstrap_darwin-amd64.tar.zst -C / - echo '/opt/procursus/sbin:/opt/procursus/bin' >> $GITHUB_PATH - PATH=/opt/procursus/sbin:/opt/procursus/bin:$PATH sudo /opt/procursus/bin/apt-get update - sudo /opt/procursus/bin/apt-get -V dist-upgrade -y || : - sudo /opt/procursus/bin/apt-get -V dist-upgrade -y - sudo /opt/procursus/bin/apt-get install ldid make sed fakeroot -y - - - name: Set up build environment pt. V - run: | - echo '/opt/procursus/sbin:/opt/procursus/bin' >> $GITHUB_PATH - - - name: Set up build environment pt. IV (cache) - if: steps.procache.outputs.cache-hit == 'true' - run: | - sudo mkdir -p ~/__cache/procursus/var/cache/apt/archives/partial ~/__cache/procursus/var/lib/apt/lists/partial - sudo rsync -aP ~/__cache/procursus /opt - sudo /opt/procursus/bin/apt-get update - sudo /opt/procursus/bin/apt-get -V dist-upgrade -y || : - sudo /opt/procursus/bin/apt-get -V dist-upgrade -y - - - name: Build the Debian package - run: gmake -j$(sysctl -n hw.ncpu) dsym - - - name: Build the iOS package + + - name: Build packages + env: + password: ${{ secrets.ELLIE_MINI_SECRET }} run: | + export NOSTDIN=1 SUDOPASS=$password + export JAVA_HOME=$(/usr/libexec/java_home -v 1.8) gmake -j$(sysctl -n hw.ncpu) ipa - name: Upload regular artifact @@ -81,9 +45,3 @@ jobs: with: name: PojavLauncher.dSYM path: artifacts/PojavLauncher.dSYM - - - name: Copy Procursus to Cache Location - run: | - sudo mkdir -p ~/__cache - sudo rsync -aP /opt/procursus ~/__cache - sudo rm -rf ~/__cache/procursus/var/cache/apt/archives/partial ~/__cache/procursus/var/lib/apt/lists/partial ~/__cache/procursus/Library/dpkg/triggers/Lock diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1d133974..53136b28 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,63 +6,21 @@ on: jobs: build: name: Release build - runs-on: macOS-11 + runs-on: MacStadium steps: - - name: Set up cache - uses: actions/cache@v2 - id: procache - with: - path: | - ~/__cache - key: ${{ runner.os }}-procursus - - - name: Set up build environment - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: '13.2.1' - - - name: Set up build environment pt. II + - name: Checkout repository uses: actions/checkout@v2 - - name: Set up build environment pt. III + - name: Checkout repository submodules run: git submodule update --init --recursive - - - name: Set up build environment pt. IV (Install) - if: steps.procache.outputs.cache-hit != 'true' + + - name: Build packages + env: + password: ${{ secrets.ELLIE_MINI_SECRET }} run: | - wget https://apt.procurs.us/bootstrap_darwin-amd64.tar.zst - sudo gtar --preserve-permissions -xkf ./bootstrap_darwin-amd64.tar.zst -C / - echo '/opt/procursus/sbin:/opt/procursus/bin' >> $GITHUB_PATH - PATH=/opt/procursus/sbin:/opt/procursus/bin:$PATH sudo /opt/procursus/bin/apt-get update - sudo /opt/procursus/bin/apt-get -V dist-upgrade -y || : - sudo /opt/procursus/bin/apt-get -V dist-upgrade -y - sudo /opt/procursus/bin/apt-get install ldid make sed fakeroot -y - - - name: Set up build environment pt. V - run: | - echo '/opt/procursus/sbin:/opt/procursus/bin' >> $GITHUB_PATH - - - name: Set up build environment pt. IV (cache) - if: steps.procache.outputs.cache-hit == 'true' - run: | - sudo mkdir -p ~/__cache/procursus/var/cache/apt/archives/partial ~/__cache/procursus/var/lib/apt/lists/partial - sudo rsync -aP ~/__cache/procursus /opt - sudo /opt/procursus/bin/apt-get update - sudo /opt/procursus/bin/apt-get -V dist-upgrade -y - sudo /opt/procursus/bin/apt-get -V dist-upgrade -y - - - name: Build the Debian package - run: gmake -j$(sysctl -n hw.ncpu) dsym RELEASE=1 - - - name: Build the iOS package - run: | - mkdir -p depends - # java-8-openjdk - cd depends - wget https://github.com/PojavLauncherTeam/android-openjdk-build-multiarch/releases/download/jre8-99f3f8b/jre8-zero-aarch64-ios.tar.xz - tar xvf jre8-zero-aarch64-ios.tar.xz - rm jre8-zero-aarch64-ios.tar.xz - cd .. + export RELEASE=1 + export NOSTDIN=1 SUDOPASS=$password + export JAVA_HOME=$(/usr/libexec/java_home -v 1.8) gmake -j$(sysctl -n hw.ncpu) ipa - name: Upload regular artifact @@ -80,7 +38,7 @@ jobs: - name: Upload IPA artifact uses: actions/upload-artifact@v2 with: - name: net.kdt.pojavlauncher-INT.ipa + name: net.kdt.pojavlauncher.ipa path: artifacts/net.kdt.pojavlauncher-*.ipa - name: Upload PojavLauncher.dSYM @@ -88,9 +46,4 @@ jobs: with: name: PojavLauncher.dSYM path: artifacts/PojavLauncher.dSYM - - - name: Copy Procursus to Cache Location - run: | - sudo mkdir -p ~/__cache - sudo rsync -aP /opt/procursus ~/__cache - sudo rm -rf ~/__cache/procursus/var/cache/apt/archives/partial ~/__cache/procursus/var/lib/apt/lists/partial ~/__cache/procursus/Library/dpkg/triggers/Lock + diff --git a/Makefile b/Makefile index 3b7ba82e..49367bbc 100644 --- a/Makefile +++ b/Makefile @@ -331,6 +331,7 @@ ipa: dsym tar xvf *.tar.xz; \ rm *.tar.xz; \ fi; \ + cd ..; \ if [ ! -d "java-17-openjdk" ]; then \ mkdir java-17-openjdk && cd java-17-openjdk; \ wget 'https://github.com/PojavLauncherTeam/android-openjdk-build-multiarch/releases/download/jre17-ca01427/jre17-arm64-20220817-release.tar.xz'; \