diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/dev.yml similarity index 72% rename from .gitea/workflows/build.yml rename to .gitea/workflows/dev.yml index 73e6b54..9c8ac47 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/dev.yml @@ -1,4 +1,4 @@ -name: build +name: dev on: push: @@ -7,18 +7,16 @@ on: branches: [main] jobs: - assemble-debug: - name: Assemble debug APK + build: + name: Build debug APK runs-on: ubuntu-latest timeout-minutes: 30 steps: - # Checkout: clone the repo directly instead of actions/checkout - name: Checkout run: | git clone https://git.trevena.info/nick/incido.git repo cd repo - # Set up JDK 17: download and extract directly (no apt-get, no root needed) - name: Set up JDK 17 run: | WORKDIR=/tmp/gitea-runner-work @@ -31,7 +29,6 @@ jobs: echo "JAVA_HOME=$WORKDIR/jdk" >> $GITHUB_ENV echo "PATH=$WORKDIR/jdk/bin:$PATH" >> $GITHUB_ENV - # Set up Android SDK via command-line tools (no root needed) - name: Set up Android SDK run: | WORKDIR=/tmp/gitea-runner-work @@ -53,25 +50,12 @@ jobs: echo "ANDROID_SDK_ROOT=$SDK" >> $GITHUB_ENV echo "PATH=$SDK/cmdline-tools/latest/bin:$SDK/platform-tools:$PATH" >> $GITHUB_ENV - - name: Grant execute permission for gradlew - run: chmod +x repo/gradlew - - - name: Cache Gradle packages - run: | - mkdir -p ~/.gradle/caches ~/.gradle/wrapper - # Copy cached gradle wrapper if available - if [ -d .github/workflows/gradle-cache ]; then - cp -r .github/workflows/gradle-cache/* ~/.gradle/ 2>/dev/null || true - fi - - - name: Build debug APK + - name: Build timeout-minutes: 25 run: | cd repo + chmod +x gradlew export JAVA_HOME=/tmp/gitea-runner-work/jdk export ANDROID_HOME=/tmp/gitea-runner-work/android-sdk export PATH=$JAVA_HOME/bin:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$PATH ./gradlew assembleDebug --no-daemon - - # Note: artifact upload requires Docker or Gitea's native actions - # Skipping artifact upload — download APK from runner workspace if needed diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml new file mode 100644 index 0000000..ce5b1f5 --- /dev/null +++ b/.gitea/workflows/release.yml @@ -0,0 +1,93 @@ +name: release + +on: + push: + tags: + - 'v*.*.*' + +jobs: + build-release: + name: Build & attach release APK + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - name: Checkout + run: | + git clone https://git.trevena.info/nick/incido.git repo + cd repo + + - name: Set up JDK 17 + run: | + WORKDIR=/tmp/gitea-runner-work + if [ ! -d "$WORKDIR/jdk" ]; then + wget -q 'https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_x64_linux_hotspot_17.0.13_11.tar.gz' -O /tmp/jdk.tar.gz + mkdir -p "$WORKDIR/jdk" + tar -xzf /tmp/jdk.tar.gz -C "$WORKDIR/jdk" --strip-components=1 + rm /tmp/jdk.tar.gz + fi + echo "JAVA_HOME=$WORKDIR/jdk" >> $GITHUB_ENV + echo "PATH=$WORKDIR/jdk/bin:$PATH" >> $GITHUB_ENV + + - name: Set up Android SDK + run: | + WORKDIR=/tmp/gitea-runner-work + SDK=$WORKDIR/android-sdk + if [ ! -d "$SDK/cmdline-tools/latest" ]; then + mkdir -p "$SDK" + wget -q 'https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip' -O /tmp/cmdline-tools.zip + unzip -q /tmp/cmdline-tools.zip -d /tmp/cmdline-tools-extract + mkdir -p "$SDK/cmdline-tools" + mv /tmp/cmdline-tools-extract/cmdline-tools "$SDK/cmdline-tools/latest" + rm -rf /tmp/cmdline-tools.zip /tmp/cmdline-tools-extract + yes | "$SDK/cmdline-tools/latest/bin/sdkmanager" --licenses > /dev/null 2>&1 || true + "$SDK/cmdline-tools/latest/bin/sdkmanager" --install \ + "platform-tools" \ + "platforms;android-34" \ + "build-tools;34.0.0" > /dev/null 2>&1 + fi + echo "ANDROID_HOME=$SDK" >> $GITHUB_ENV + echo "ANDROID_SDK_ROOT=$SDK" >> $GITHUB_ENV + echo "PATH=$SDK/cmdline-tools/latest/bin:$SDK/platform-tools:$PATH" >> $GITHUB_ENV + + - name: Build release APK + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + set -e + cd repo + chmod +x gradlew + export JAVA_HOME=/tmp/gitea-runner-work/jdk + export ANDROID_HOME=/tmp/gitea-runner-work/android-sdk + export PATH=$JAVA_HOME/bin:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$PATH + + # Build release APK + ./gradlew assembleRelease --no-daemon + + # Find the APK + TAG="${GITHUB_REF##*/}" + APK=$(find app/build/outputs -name '*.apk' | head -1) + echo "APK_PATH=$APK" >> $GITHUB_ENV + echo "APK_NAME=$(basename $APK)" >> $GITHUB_ENV + echo "Built APK: $APK" + + # Create release and attach APK in one step + echo "Creating release for tag: $TAG" + RELEASE_ID=$(curl -s -X POST "https://git.trevena.info/api/v1/repos/nick/incido/releases" \ + -H "Authorization: token $GITHUB_TOKEN" \ + -H "Content-Type: application/json" \ + -d "{ + \"tag_name\": \"$TAG\", + \"name\": \"$TAG\", + \"draft\": false, + \"prerelease\": false + }" | python3 -c "import sys,json; print(json.load(sys.stdin).get('id','') or '')") + echo "Release ID: $RELEASE_ID" + + if [ -n "$RELEASE_ID" ] && [ -f "$APK" ]; then + curl -s -X POST "https://git.trevena.info/api/v1/repos/nick/incido/releases/$RELEASE_ID/assets" \ + -H "Authorization: token $GITHUB_TOKEN" \ + -F "attachment=@$APK;filename=$(basename $APK)" + echo "APK $(basename $APK) attached to release $TAG" + else + echo "WARNING: Could not attach APK (release_id=$RELEASE_ID, apk_exists=$(test -f '$APK' && echo yes || echo no))" + fi