From 156661bfbacc6e42b43c66c8335014a46284d123 Mon Sep 17 00:00:00 2001
From: Remy Moll <me@moll.re>
Date: Wed, 18 Sep 2024 17:04:21 +0200
Subject: [PATCH] fix remote repo pushing
---
.../frontend_trigger_deployment.yaml | 37 ++--
.../.github/workflows/build_app_android.yaml | 27 ++-
frontend/android/.gitignore | 2 -
frontend/android/fastlane/Fastfile | 30 +---
frontend/android/fastlane/README.md | 20 +--
frontend/android/fastlane/report.xml | 23 ---
frontend/android/gradlew | 160 ++++++++++++++++++
7 files changed, 220 insertions(+), 79 deletions(-)
delete mode 100644 frontend/android/fastlane/report.xml
create mode 100755 frontend/android/gradlew
diff --git a/.gitea/workflows/frontend_trigger_deployment.yaml b/.gitea/workflows/frontend_trigger_deployment.yaml
index 163e477..1f32b0d 100644
--- a/.gitea/workflows/frontend_trigger_deployment.yaml
+++ b/.gitea/workflows/frontend_trigger_deployment.yaml
@@ -10,15 +10,30 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
- uses: actions/checkout@v2
-
- - name: Push to github remote
- uses: https://github.com/actions/cpina/github-action-push-to-another-repository@main
- env:
- API_TOKEN_GITHUB: ${{ secrets.PUSH_GITHUB_API_TOKEN }}
+ uses: actions/checkout@v3
with:
- source-directory: 'frontend'
- destination-github-username: 'moll-re'
- destination-repository-name: 'anyway-frontend-builder'
- user-email: me@moll.re
- target-branch: main
+ path: 'src'
+
+ - name: Checkout remote repository
+ uses: actions/checkout@v3
+ with:
+ path: 'dest'
+ ref: 'main'
+ github-server-url: 'https://github.com'
+ repository: 'moll-re/anyway-frontend-builder'
+ token: ${{ secrets.PUSH_GITHUB_API_TOKEN }}
+ fetch-depth: 0
+ persist-credentials: true
+
+ - name: Copy files to remote repository
+ run: cp -r src/frontend/. dest/
+
+ - name: Commit and push changes
+ run: |
+ cd dest
+ git config --global user.email "me@moll.re"
+ git config --global user.name "[bot]"
+ git add .
+ git commit -m "Automatic code update for tag"
+ git tag -a ${{ github.ref_name }} -m "mirrored tag"
+ git push origin main --tags
diff --git a/frontend/.github/workflows/build_app_android.yaml b/frontend/.github/workflows/build_app_android.yaml
index 231dba5..05dae9c 100644
--- a/frontend/.github/workflows/build_app_android.yaml
+++ b/frontend/.github/workflows/build_app_android.yaml
@@ -5,12 +5,12 @@ on:
jobs:
build:
- runs-on: macos-lastest
+ runs-on: macos-latest
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
- name: Set up ruby env
- uses: ruby/setup-ruby@v1.138.0
+ uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.1
bundler-cache: true
@@ -20,9 +20,9 @@ jobs:
with:
java-version: '17'
distribution: 'zulu'
-
+
- name: Setup android SDK
- uses: https://github.com/android-actions/setup-android@v3
+ uses: android-actions/setup-android@v3
- name: Infer version number from git tag
id: version
@@ -30,10 +30,21 @@ jobs:
REF_NAME: ${{ github.ref_name }}
run:
# remove the 'v' prefix from the tag name
- echo "VERSION=${REF_NAME//v}" >> $GITHUB_ENV
+ echo "VERSION=${REF_NAME//v}" >> $GITHUB_OUTPUT
+
+ - name: Load secrets from github
+ run: |
+ echo "${{ secrets.ANDROID_SECRET_PROPERTIES }}" > secrets.properties
+ echo "${{ secrets.ANDROID_KEYSTORE }}" > release.keystore
+ echo "${{ secrets.ANDROID_GOOGLE_PLAY_JSON }}" > google-key.json
+ working-directory: android
+
+ - name: Install fastlane
+ run: bundle install
+ working-directory: android
- name: Run fastlane lane
- run: bundle exec fastlane deploy
+ run: bundle exec fastlane deploy_release
working-directory: android
env:
- VERSION_NAME: ${{outputs.version.VERSION}}
+ VERSION_NAME: ${{ steps.version.VERSION }}
diff --git a/frontend/android/.gitignore b/frontend/android/.gitignore
index 5a079a6..23a3672 100644
--- a/frontend/android/.gitignore
+++ b/frontend/android/.gitignore
@@ -1,8 +1,6 @@
gradle-wrapper.jar
/.gradle
/captures/
-/gradlew
-/gradlew.bat
/local.properties
/secrets.properties
GeneratedPluginRegistrant.java
diff --git a/frontend/android/fastlane/Fastfile b/frontend/android/fastlane/Fastfile
index 1ce49f1..7b8f0f2 100644
--- a/frontend/android/fastlane/Fastfile
+++ b/frontend/android/fastlane/Fastfile
@@ -1,28 +1,16 @@
-# This file contains the fastlane.tools configuration
-# You can find the documentation at https://docs.fastlane.tools
-#
-# For a list of all available actions, check out
-#
-# https://docs.fastlane.tools/actions
-#
-# For a list of all available plugins, check out
-#
-# https://docs.fastlane.tools/plugins/available-plugins
-#
-
# Uncomment the line if you want fastlane to automatically update itself
# update_fastlane
default_platform(:android)
platform :android do
- desc "Runs all the tests"
- lane :test do
- gradle(task: "test")
- end
+ # desc "Runs all the tests"
+ # lane :test do
+ # gradle(task: "test")
+ # end
- desc "Submit a new build to the closed testing lane"
- lane :closed_testing do
+ desc "Deploy a new version as a preview version"
+ lane :deploy_testing do
gradle(
task: "bundle",
# flavor: "staging",
@@ -35,13 +23,13 @@ platform :android do
)
end
- desc "Deploy a new release to the Google Play"
- lane :deploy do
+ desc "Deploy a new version as a full release"
+ lane :deploy_release do
gradle(
task: "clean assembleRelease",
properties: {
# loaded from environment
- android.injected.version.name: ENV["VERSION_NAME"],
+ "android.injected.version.name" => ENV["VERSION_NAME"],
}
)
upload_to_play_store(
diff --git a/frontend/android/fastlane/README.md b/frontend/android/fastlane/README.md
index 574d585..897c89f 100644
--- a/frontend/android/fastlane/README.md
+++ b/frontend/android/fastlane/README.md
@@ -15,29 +15,21 @@ For _fastlane_ installation instructions, see [Installing _fastlane_](https://do
## Android
-### android test
+### android deploy_testing
```sh
-[bundle exec] fastlane android test
+[bundle exec] fastlane android deploy_testing
```
-Runs all the tests
+Deploy a new version as a preview version
-### android closed_testing
+### android deploy_release
```sh
-[bundle exec] fastlane android closed_testing
+[bundle exec] fastlane android deploy_release
```
-Submit a new build to the closed testing lane
-
-### android deploy
-
-```sh
-[bundle exec] fastlane android deploy
-```
-
-Deploy a new version to the Google Play
+Deploy a new version as a full release
----
diff --git a/frontend/android/fastlane/report.xml b/frontend/android/fastlane/report.xml
deleted file mode 100644
index 07d4bb8..0000000
--- a/frontend/android/fastlane/report.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
- <testsuite name="fastlane.lanes">
-
-
-
-
- <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000594355">
-
- </testcase>
-
-
- <testcase classname="fastlane.lanes" name="1: bundle" time="11.355126485">
-
- </testcase>
-
-
- <testcase classname="fastlane.lanes" name="2: upload_to_play_store" time="63.414149183">
-
- </testcase>
-
- </testsuite>
-</testsuites>
diff --git a/frontend/android/gradlew b/frontend/android/gradlew
new file mode 100755
index 0000000..9d82f78
--- /dev/null
+++ b/frontend/android/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+ echo "$*"
+}
+
+die ( ) {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+ JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"