From 149881522e7a6e50442de65c1e8fa1e82826a9de Mon Sep 17 00:00:00 2001 From: eyedeekay Date: Mon, 25 Mar 2024 14:25:52 -0400 Subject: [PATCH] specify a tag for non-trunk CI builds --- .github/workflows/ant.yml | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml index 68a587db9..9364e1239 100644 --- a/.github/workflows/ant.yml +++ b/.github/workflows/ant.yml @@ -31,15 +31,15 @@ jobs: - name: build with Gradle run: | echo "i2psrc=$HOME/i2p.i2p" > routerjars/local.properties - git clone https://github.com/i2p/i2p.i2p "$HOME/i2p.i2p" + git clone -b i2p-2.3.0 https://github.com/i2p/i2p.i2p "$HOME/i2p.i2p" ./gradlew assembleDebug find . -name '*.apk' + - name: Upload i2p-debug-${{ github.sha }}.apk + uses: actions/upload-artifact@v4 + with: + name: i2p-debug.apk + path: ./app/build/outputs/apk/free/debug/app-free-debug.apk - #- name: Upload installer.jar - # uses: actions/upload-artifact@v4 - # with: - # name: I2P-install.jar-${{ github.sha }} - # path: install.jar trunk: runs-on: ubuntu-latest @@ -57,18 +57,19 @@ jobs: rm -f override.properties echo "build.built-by=GitHub Actions" >> override.properties echo "noExe=true" >> override.properties - echo "I2P_VERSION=2.4.0-1" >> override.properties - echo "I2P_ANDROID_VERSION=2.4.0-1" >> override.properties + grep -v I2P_ gradle.properties > gradle.properties.update + echo "I2P_VERSION=2.4.0-1" >> gradle.properties.update + echo "I2P_ANDROID_VERSION=2.4.0-1" >> gradle.properties.update + cp -v gradle.properties.update gradle.properties - name: build with Gradle run: | echo "i2psrc=$HOME/i2p.i2p" > routerjars/local.properties - git clone https://github.com/i2p/i2p.i2p "$HOME/i2p.i2p" + git clone -b master https://github.com/i2p/i2p.i2p "$HOME/i2p.i2p" cd i2p.i2p && ./installer/resources/maven-dev-release.sh 1 ./gradlew assembleDebug find . -name '*.apk' - - #- name: Upload installer.jar - # uses: actions/upload-artifact@v4 - # with: - # name: I2P-install.jar-${{ github.sha }} - # path: install.jar + - name: Upload i2p-debug-${{ github.sha }}.apk + uses: actions/upload-artifact@v4 + with: + name: i2p-debug-${{ github.sha }}.apk + path: ./app/build/outputs/apk/free/debug/app-free-debug.apk