From 97657097edccb99a73a7941cf2a99f84614b12b3 Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 27 Jul 2024 17:03:45 -0300 Subject: [PATCH 01/40] feat(ci): set up SDK manager path and install platform tools --- .github/workflows/ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6fd5b607..b565ce0d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,11 +53,17 @@ jobs: restore-keys: | ${{ runner.os }}-gradle-${{ matrix.java }}- + # Set up Android SDK and install platform-tools + - name: Set up Android SDK + run: | + SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager + echo "y" | ${SDKMANAGER} "platform-tools" + - name: Environment info run: | ./gradlew --version echo ANDROID_SDK_ROOT: ${ANDROID_SDK_ROOT} - ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --version + ${SDKMANAGER} --version echo JAVA_HOME: ${JAVA_HOME} java -version javac -version From dc6389a70edcc629b99d02e40cbb687612ab8146 Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 27 Jul 2024 19:34:02 -0300 Subject: [PATCH 02/40] feat(ci): set up SDK manager older version for Java 8 --- .github/workflows/ci.yml | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b565ce0d..1b01cd10 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,11 +18,28 @@ jobs: - name: Fetch git tags run: ./.github/fetch_to_tag.sh + # Download and set up an older version of the Android Command Line Tools + - name: Download Android Command Line Tools (older version) + run: | + wget https://dl.google.com/android/repository/commandlinetools-linux-6609375_latest.zip -O commandlinetools.zip + unzip commandlinetools.zip -d ${ANDROID_SDK_ROOT} + rm commandlinetools.zip + + - name: Set up Java 8 + uses: actions/setup-java@v2 + with: + java-version: 8 + + - name: Set up Android SDK and install platform-tools + run: | + SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager + echo "y" | ${SDKMANAGER} "platform-tools" + # Our build uses JDK7's rt.jar to make sure the artifact is fully # compatible with Java 7, so we let this action set Java 7 up for us # and we store its JAVA_HOME - name: Set up Java 7 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 7 @@ -30,7 +47,7 @@ jobs: run: echo "export JDK7_HOME=\"$JAVA_HOME\"" > ~/.jdk7_home - name: Set up Java 17 (needed for Spring Boot 3) - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 17 @@ -39,7 +56,7 @@ jobs: # This is the JDK that'll run the build - name: Set up Java ${{ matrix.java }} - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: ${{ matrix.java }} @@ -53,17 +70,11 @@ jobs: restore-keys: | ${{ runner.os }}-gradle-${{ matrix.java }}- - # Set up Android SDK and install platform-tools - - name: Set up Android SDK - run: | - SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager - echo "y" | ${SDKMANAGER} "platform-tools" - - name: Environment info run: | ./gradlew --version echo ANDROID_SDK_ROOT: ${ANDROID_SDK_ROOT} - ${SDKMANAGER} --version + ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --version echo JAVA_HOME: ${JAVA_HOME} java -version javac -version @@ -91,7 +102,7 @@ jobs: - uses: actions/checkout@v2 - name: Set up Java 7 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 7 @@ -99,7 +110,7 @@ jobs: run: echo "export JDK7_HOME=\"$JAVA_HOME\"" > ~/.jdk7_home - name: Set up Java 8 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 8 From af8e0580c70c445f77665e42cd5ccb9d337d528a Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 27 Jul 2024 19:37:50 -0300 Subject: [PATCH 03/40] feat(ci): add distribution --- .github/workflows/ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1b01cd10..2fa08215 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,10 +25,12 @@ jobs: unzip commandlinetools.zip -d ${ANDROID_SDK_ROOT} rm commandlinetools.zip + # Set up Java 8 (needed for sdkmanager) - name: Set up Java 8 uses: actions/setup-java@v2 with: java-version: 8 + distribution: 'adopt-openjdk' - name: Set up Android SDK and install platform-tools run: | @@ -42,6 +44,7 @@ jobs: uses: actions/setup-java@v2 with: java-version: 7 + distribution: 'adopt-openjdk' - name: Capture JDK7_HOME run: echo "export JDK7_HOME=\"$JAVA_HOME\"" > ~/.jdk7_home @@ -50,6 +53,7 @@ jobs: uses: actions/setup-java@v2 with: java-version: 17 + distribution: 'adopt-openjdk' - name: Capture JDK17_HOME run: echo "export JDK17_HOME=\"$JAVA_HOME\"" > ~/.jdk17_home @@ -59,6 +63,7 @@ jobs: uses: actions/setup-java@v2 with: java-version: ${{ matrix.java }} + distribution: 'adopt-openjdk' - name: Cache Gradle packages uses: actions/cache@v2 @@ -105,6 +110,7 @@ jobs: uses: actions/setup-java@v2 with: java-version: 7 + distribution: 'adopt-openjdk' - name: Capture JDK7_HOME run: echo "export JDK7_HOME=\"$JAVA_HOME\"" > ~/.jdk7_home @@ -113,6 +119,7 @@ jobs: uses: actions/setup-java@v2 with: java-version: 8 + distribution: 'adopt-openjdk' - name: Cache Gradle packages uses: actions/cache@v2 From 3131f349fd36ebd91363574785bc1f3476acfa9f Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 27 Jul 2024 19:40:59 -0300 Subject: [PATCH 04/40] feat(ci): modify distribution --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2fa08215..f9daa552 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: uses: actions/setup-java@v2 with: java-version: 8 - distribution: 'adopt-openjdk' + distribution: 'zulu' - name: Set up Android SDK and install platform-tools run: | @@ -44,7 +44,7 @@ jobs: uses: actions/setup-java@v2 with: java-version: 7 - distribution: 'adopt-openjdk' + distribution: 'zulu' - name: Capture JDK7_HOME run: echo "export JDK7_HOME=\"$JAVA_HOME\"" > ~/.jdk7_home @@ -53,7 +53,7 @@ jobs: uses: actions/setup-java@v2 with: java-version: 17 - distribution: 'adopt-openjdk' + distribution: 'zulu' - name: Capture JDK17_HOME run: echo "export JDK17_HOME=\"$JAVA_HOME\"" > ~/.jdk17_home @@ -63,7 +63,7 @@ jobs: uses: actions/setup-java@v2 with: java-version: ${{ matrix.java }} - distribution: 'adopt-openjdk' + distribution: 'zulu' - name: Cache Gradle packages uses: actions/cache@v2 @@ -110,7 +110,7 @@ jobs: uses: actions/setup-java@v2 with: java-version: 7 - distribution: 'adopt-openjdk' + distribution: 'zulu' - name: Capture JDK7_HOME run: echo "export JDK7_HOME=\"$JAVA_HOME\"" > ~/.jdk7_home @@ -119,7 +119,7 @@ jobs: uses: actions/setup-java@v2 with: java-version: 8 - distribution: 'adopt-openjdk' + distribution: 'zulu' - name: Cache Gradle packages uses: actions/cache@v2 From bc5bfb7b1c13c7ca9252350903711a184d59dcc5 Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 27 Jul 2024 22:46:51 -0300 Subject: [PATCH 05/40] feat(ci): just install old command line tool --- .github/workflows/ci.yml | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f9daa552..a3b24b90 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,45 +25,30 @@ jobs: unzip commandlinetools.zip -d ${ANDROID_SDK_ROOT} rm commandlinetools.zip - # Set up Java 8 (needed for sdkmanager) - - name: Set up Java 8 - uses: actions/setup-java@v2 - with: - java-version: 8 - distribution: 'zulu' - - - name: Set up Android SDK and install platform-tools - run: | - SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager - echo "y" | ${SDKMANAGER} "platform-tools" - # Our build uses JDK7's rt.jar to make sure the artifact is fully # compatible with Java 7, so we let this action set Java 7 up for us # and we store its JAVA_HOME - name: Set up Java 7 - uses: actions/setup-java@v2 + uses: actions/setup-java@v1 with: java-version: 7 - distribution: 'zulu' - name: Capture JDK7_HOME run: echo "export JDK7_HOME=\"$JAVA_HOME\"" > ~/.jdk7_home - name: Set up Java 17 (needed for Spring Boot 3) - uses: actions/setup-java@v2 + uses: actions/setup-java@v1 with: java-version: 17 - distribution: 'zulu' - name: Capture JDK17_HOME run: echo "export JDK17_HOME=\"$JAVA_HOME\"" > ~/.jdk17_home # This is the JDK that'll run the build - name: Set up Java ${{ matrix.java }} - uses: actions/setup-java@v2 + uses: actions/setup-java@v1 with: java-version: ${{ matrix.java }} - distribution: 'zulu' - name: Cache Gradle packages uses: actions/cache@v2 @@ -107,19 +92,17 @@ jobs: - uses: actions/checkout@v2 - name: Set up Java 7 - uses: actions/setup-java@v2 + uses: actions/setup-java@v1 with: java-version: 7 - distribution: 'zulu' - name: Capture JDK7_HOME run: echo "export JDK7_HOME=\"$JAVA_HOME\"" > ~/.jdk7_home - name: Set up Java 8 - uses: actions/setup-java@v2 + uses: actions/setup-java@v1 with: java-version: 8 - distribution: 'zulu' - name: Cache Gradle packages uses: actions/cache@v2 From a7fbf943c4ee969f78387bdbae7ff74c67ac4cda Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 27 Jul 2024 23:13:45 -0300 Subject: [PATCH 06/40] feat(ci): install platform tools --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a3b24b90..06d58250 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,6 +24,7 @@ jobs: wget https://dl.google.com/android/repository/commandlinetools-linux-6609375_latest.zip -O commandlinetools.zip unzip commandlinetools.zip -d ${ANDROID_SDK_ROOT} rm commandlinetools.zip + ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --install "platform-tools" # Our build uses JDK7's rt.jar to make sure the artifact is fully # compatible with Java 7, so we let this action set Java 7 up for us From a301a7711806af37b30cada3e86b0c8c86fe0a94 Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 27 Jul 2024 23:47:04 -0300 Subject: [PATCH 07/40] feat(ci): use a newer version of skd tools --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 06d58250..784b9c48 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,10 +21,9 @@ jobs: # Download and set up an older version of the Android Command Line Tools - name: Download Android Command Line Tools (older version) run: | - wget https://dl.google.com/android/repository/commandlinetools-linux-6609375_latest.zip -O commandlinetools.zip + wget https://dl.google.com/android/repository/commandlinetools-linux-9862592_latest.zip -O commandlinetools.zip unzip commandlinetools.zip -d ${ANDROID_SDK_ROOT} rm commandlinetools.zip - ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --install "platform-tools" # Our build uses JDK7's rt.jar to make sure the artifact is fully # compatible with Java 7, so we let this action set Java 7 up for us From 581c58e2249c1ce35fc1055a3aa2ec06083a6d79 Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 27 Jul 2024 23:49:15 -0300 Subject: [PATCH 08/40] feat(ci): use a older version of skd tools --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 784b9c48..0711d9fa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: # Download and set up an older version of the Android Command Line Tools - name: Download Android Command Line Tools (older version) run: | - wget https://dl.google.com/android/repository/commandlinetools-linux-9862592_latest.zip -O commandlinetools.zip + wget https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip -O commandlinetools.zip unzip commandlinetools.zip -d ${ANDROID_SDK_ROOT} rm commandlinetools.zip From b571567d5642a73fc26aaa7dbeb4ba6ebf1d7e36 Mon Sep 17 00:00:00 2001 From: chris Date: Sun, 28 Jul 2024 02:50:16 -0300 Subject: [PATCH 09/40] feat(ci): use a older version of skd tools --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0711d9fa..aba30dae 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: # Download and set up an older version of the Android Command Line Tools - name: Download Android Command Line Tools (older version) run: | - wget https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip -O commandlinetools.zip + wget https://dl.google.com/android/repository/commandlinetools-linux-4333796_latest.zip -O commandlinetools.zip unzip commandlinetools.zip -d ${ANDROID_SDK_ROOT} rm commandlinetools.zip From 2a315af88e4e26a9c4f83654368678289ad9d5e3 Mon Sep 17 00:00:00 2001 From: chris Date: Sun, 28 Jul 2024 03:00:36 -0300 Subject: [PATCH 10/40] feat(ci): use a older version of skd tools --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aba30dae..b4e4758c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: # Download and set up an older version of the Android Command Line Tools - name: Download Android Command Line Tools (older version) run: | - wget https://dl.google.com/android/repository/commandlinetools-linux-4333796_latest.zip -O commandlinetools.zip + wget https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip -O commandlinetools.zip unzip commandlinetools.zip -d ${ANDROID_SDK_ROOT} rm commandlinetools.zip From 6dcece25c121f9e218ada8f99ac91e5a2d3659df Mon Sep 17 00:00:00 2001 From: chris Date: Sun, 28 Jul 2024 03:23:17 -0300 Subject: [PATCH 11/40] feat(ci): swap logs --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b4e4758c..899b0fb1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,12 +62,12 @@ jobs: - name: Environment info run: | + java -version + javac -version + echo JAVA_HOME: ${JAVA_HOME} ./gradlew --version echo ANDROID_SDK_ROOT: ${ANDROID_SDK_ROOT} ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --version - echo JAVA_HOME: ${JAVA_HOME} - java -version - javac -version - name: Build run: 'source ~/.jdk7_home && ./gradlew clean build' From aa5d143aad43d14321122617d8da6bf339586c8a Mon Sep 17 00:00:00 2001 From: chris Date: Mon, 29 Jul 2024 19:20:38 -0300 Subject: [PATCH 12/40] feat(ci): move log --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 899b0fb1..1fb7fe58 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,6 +24,7 @@ jobs: wget https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip -O commandlinetools.zip unzip commandlinetools.zip -d ${ANDROID_SDK_ROOT} rm commandlinetools.zip + ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --version # Our build uses JDK7's rt.jar to make sure the artifact is fully # compatible with Java 7, so we let this action set Java 7 up for us @@ -67,7 +68,7 @@ jobs: echo JAVA_HOME: ${JAVA_HOME} ./gradlew --version echo ANDROID_SDK_ROOT: ${ANDROID_SDK_ROOT} - ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --version + - name: Build run: 'source ~/.jdk7_home && ./gradlew clean build' From aac607837093143402ff65460a310d86575e7c99 Mon Sep 17 00:00:00 2001 From: chris Date: Mon, 29 Jul 2024 19:25:27 -0300 Subject: [PATCH 13/40] feat(ci): install old platform tools --- .github/workflows/ci.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1fb7fe58..d044f02a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,12 +19,13 @@ jobs: run: ./.github/fetch_to_tag.sh # Download and set up an older version of the Android Command Line Tools - - name: Download Android Command Line Tools (older version) - run: | - wget https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip -O commandlinetools.zip - unzip commandlinetools.zip -d ${ANDROID_SDK_ROOT} - rm commandlinetools.zip - ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --version + - name: Setup Android SDK 27, 28, 29 and 30 + uses: android-actions/setup-android@v3 + with: + cmdline-tools-version: 9123335 + run: sdkmanager tools "platforms;android-27" "platforms;android-28" "platforms;android-29" "platforms;android-30" + + # Our build uses JDK7's rt.jar to make sure the artifact is fully # compatible with Java 7, so we let this action set Java 7 up for us @@ -68,7 +69,7 @@ jobs: echo JAVA_HOME: ${JAVA_HOME} ./gradlew --version echo ANDROID_SDK_ROOT: ${ANDROID_SDK_ROOT} - + ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --version - name: Build run: 'source ~/.jdk7_home && ./gradlew clean build' From d03cf43916acfbeec66afd6df9b246ed8ecae680 Mon Sep 17 00:00:00 2001 From: chris Date: Mon, 29 Jul 2024 19:28:34 -0300 Subject: [PATCH 14/40] feat(ci): add dash --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d044f02a..0693d596 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: uses: android-actions/setup-android@v3 with: cmdline-tools-version: 9123335 - run: sdkmanager tools "platforms;android-27" "platforms;android-28" "platforms;android-29" "platforms;android-30" + - run: sdkmanager tools "platforms;android-27" "platforms;android-28" "platforms;android-29" "platforms;android-30" From ed0bdf15c3db6abd0f51b4eb4d90b8b98372021f Mon Sep 17 00:00:00 2001 From: chris Date: Tue, 30 Jul 2024 01:22:15 -0300 Subject: [PATCH 15/40] feat(ci): remove java 11 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0693d596..c33cd9ab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: name: Java ${{ matrix.java }} strategy: matrix: - java: [8, 11] + java: [8] steps: - uses: actions/checkout@v2 From da9843ff1328c075f8a23e15af15c02011c3559d Mon Sep 17 00:00:00 2001 From: chris Date: Tue, 30 Jul 2024 01:23:03 -0300 Subject: [PATCH 16/40] Revert "feat(ci): remove java 11" This reverts commit ed0bdf15c3db6abd0f51b4eb4d90b8b98372021f. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c33cd9ab..0693d596 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: name: Java ${{ matrix.java }} strategy: matrix: - java: [8] + java: [8, 11] steps: - uses: actions/checkout@v2 From cb3581df4e9d0932467f5b91a2b5bc56d44e3785 Mon Sep 17 00:00:00 2001 From: chris Date: Thu, 1 Aug 2024 23:44:22 -0300 Subject: [PATCH 17/40] feat(ci): change command line tools version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0693d596..921cda78 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: - name: Setup Android SDK 27, 28, 29 and 30 uses: android-actions/setup-android@v3 with: - cmdline-tools-version: 9123335 + cmdline-tools-version: 6858069 - run: sdkmanager tools "platforms;android-27" "platforms;android-28" "platforms;android-29" "platforms;android-30" From 90e4b8995a30e86a02a3e51a04f3a517e9d37173 Mon Sep 17 00:00:00 2001 From: chris Date: Thu, 1 Aug 2024 23:53:55 -0300 Subject: [PATCH 18/40] feat(ci): set old command line tools version --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 921cda78..2568c43f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,11 +19,11 @@ jobs: run: ./.github/fetch_to_tag.sh # Download and set up an older version of the Android Command Line Tools - - name: Setup Android SDK 27, 28, 29 and 30 - uses: android-actions/setup-android@v3 - with: - cmdline-tools-version: 6858069 - - run: sdkmanager tools "platforms;android-27" "platforms;android-28" "platforms;android-29" "platforms;android-30" + - name: Download Android Command Line Tools (older version) + run: | + wget https://dl.google.com/android/repository/sdk-tools-linux-6858069.zip -O commandlinetools.zip + unzip commandlinetools.zip -d ${ANDROID_SDK_ROOT} + rm commandlinetools.zip From 3c2a3daddb3578835ae011cf4a0c57d4177df020 Mon Sep 17 00:00:00 2001 From: chris Date: Thu, 1 Aug 2024 23:56:48 -0300 Subject: [PATCH 19/40] feat(ci): set old command line tools version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2568c43f..efb7748e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: # Download and set up an older version of the Android Command Line Tools - name: Download Android Command Line Tools (older version) run: | - wget https://dl.google.com/android/repository/sdk-tools-linux-6858069.zip -O commandlinetools.zip + wget https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip -O commandlinetools.zip unzip commandlinetools.zip -d ${ANDROID_SDK_ROOT} rm commandlinetools.zip From c5e662b22947820858c72ffa7f32577022a6e96d Mon Sep 17 00:00:00 2001 From: chris Date: Fri, 2 Aug 2024 00:01:17 -0300 Subject: [PATCH 20/40] feat(ci): change path --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index efb7748e..080222c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,7 +69,7 @@ jobs: echo JAVA_HOME: ${JAVA_HOME} ./gradlew --version echo ANDROID_SDK_ROOT: ${ANDROID_SDK_ROOT} - ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --version + ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --version - name: Build run: 'source ~/.jdk7_home && ./gradlew clean build' From fa149cb99d8bf887f1eac109dc8c809f81c752dc Mon Sep 17 00:00:00 2001 From: chris Date: Fri, 2 Aug 2024 19:47:52 -0300 Subject: [PATCH 21/40] feat(ci): try another version --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 080222c8..63414d29 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: # Download and set up an older version of the Android Command Line Tools - name: Download Android Command Line Tools (older version) run: | - wget https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip -O commandlinetools.zip + wget https://dl.google.com/android/repository/commandlinetools-linux-6825553_latest.zip -O commandlinetools.zip unzip commandlinetools.zip -d ${ANDROID_SDK_ROOT} rm commandlinetools.zip @@ -69,7 +69,7 @@ jobs: echo JAVA_HOME: ${JAVA_HOME} ./gradlew --version echo ANDROID_SDK_ROOT: ${ANDROID_SDK_ROOT} - ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --version + ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --version - name: Build run: 'source ~/.jdk7_home && ./gradlew clean build' From 59eb57a2d50d489d1b0a88a983e4945f32de43b2 Mon Sep 17 00:00:00 2001 From: chris Date: Fri, 2 Aug 2024 19:50:21 -0300 Subject: [PATCH 22/40] feat(ci): try another version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 63414d29..ae9d4333 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: # Download and set up an older version of the Android Command Line Tools - name: Download Android Command Line Tools (older version) run: | - wget https://dl.google.com/android/repository/commandlinetools-linux-6825553_latest.zip -O commandlinetools.zip + wget https://dl.google.com/android/repository/commandlinetools-linux-6609375_latest.zip -O commandlinetools.zip unzip commandlinetools.zip -d ${ANDROID_SDK_ROOT} rm commandlinetools.zip From ad80b7bce1a43d4f466df6ceccc96a54918dc6bb Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 3 Aug 2024 15:45:12 -0300 Subject: [PATCH 23/40] feat(ci): update sdkmanager --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ae9d4333..917f6ec6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,6 +24,7 @@ jobs: wget https://dl.google.com/android/repository/commandlinetools-linux-6609375_latest.zip -O commandlinetools.zip unzip commandlinetools.zip -d ${ANDROID_SDK_ROOT} rm commandlinetools.zip + yes | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --update From 3df0eeba21d7c0adc57d7f518c1265446ff0aa2a Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 3 Aug 2024 16:24:16 -0300 Subject: [PATCH 24/40] feat(ci): Setup Android SDK --- .github/workflows/ci.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 917f6ec6..6358f0a8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,14 +18,8 @@ jobs: - name: Fetch git tags run: ./.github/fetch_to_tag.sh - # Download and set up an older version of the Android Command Line Tools - - name: Download Android Command Line Tools (older version) - run: | - wget https://dl.google.com/android/repository/commandlinetools-linux-6609375_latest.zip -O commandlinetools.zip - unzip commandlinetools.zip -d ${ANDROID_SDK_ROOT} - rm commandlinetools.zip - yes | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --update - + - name: Setup Android SDK + uses: android-actions/setup-android@v3 # Our build uses JDK7's rt.jar to make sure the artifact is fully From 85d5b491181f8f059cfeaa5a0ef053bae8aff7ef Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 3 Aug 2024 16:29:01 -0300 Subject: [PATCH 25/40] feat(ci): Setup Android SDK version 3.2.0 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6358f0a8..4f77cf2d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: run: ./.github/fetch_to_tag.sh - name: Setup Android SDK - uses: android-actions/setup-android@v3 + uses: android-actions/setup-android@07976c6290703d34c16d382cb36445f98bb43b1f # Our build uses JDK7's rt.jar to make sure the artifact is fully From 995eec134824f797f54a480e8bc056bf050fd0fe Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 3 Aug 2024 16:34:23 -0300 Subject: [PATCH 26/40] feat(ci): Setup Android SDK another version --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4f77cf2d..30d98883 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,9 @@ jobs: run: ./.github/fetch_to_tag.sh - name: Setup Android SDK - uses: android-actions/setup-android@07976c6290703d34c16d382cb36445f98bb43b1f + uses: android-actions/setup-android@v3 + with: + cmdline-tools-version: 8512546 # Our build uses JDK7's rt.jar to make sure the artifact is fully From 1807af419c40fd439e91b2ba73a4b2cc4975c231 Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 3 Aug 2024 19:13:33 -0300 Subject: [PATCH 27/40] feat(ci): Setup Android SDK another version --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 30d98883..506a8e5a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,8 @@ jobs: - name: Setup Android SDK uses: android-actions/setup-android@v3 with: - cmdline-tools-version: 8512546 + cmdline-tools-version: 9123335 + # Our build uses JDK7's rt.jar to make sure the artifact is fully From 98e11c4d51f90c8d318497e5e8b272652a976971 Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 3 Aug 2024 19:15:38 -0300 Subject: [PATCH 28/40] feat(ci): Setup Android SDK version 10 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 506a8e5a..fbf3f8ce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: - name: Setup Android SDK uses: android-actions/setup-android@v3 with: - cmdline-tools-version: 9123335 + cmdline-tools-version: 9862592 From 31a5d5e8d8750d9bd5ef9a8767199b9071f991d9 Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 3 Aug 2024 19:17:24 -0300 Subject: [PATCH 29/40] feat(ci): Setup Android SDK version 9 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fbf3f8ce..e72ab46c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: - name: Setup Android SDK uses: android-actions/setup-android@v3 with: - cmdline-tools-version: 9862592 + cmdline-tools-version: 9477386 From 1bfd4a7123679ef3a2d14b693ddb5917a619428f Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 3 Aug 2024 19:21:40 -0300 Subject: [PATCH 30/40] feat(ci): Setup Android SDK version 11 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e72ab46c..356496e5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: - name: Setup Android SDK uses: android-actions/setup-android@v3 with: - cmdline-tools-version: 9477386 + cmdline-tools-version: 10406996 From 4db881fd5c3cc72b7b7b6147d8453eb45ae9cec2 Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 3 Aug 2024 21:47:36 -0300 Subject: [PATCH 31/40] feat(ci): Setup Android SDK version 9 and add java 8 to sdk manager --- .github/workflows/ci.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 356496e5..a7ed6829 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: - name: Setup Android SDK uses: android-actions/setup-android@v3 with: - cmdline-tools-version: 10406996 + cmdline-tools-version: 9477386 @@ -36,6 +36,16 @@ jobs: - name: Capture JDK7_HOME run: echo "export JDK7_HOME=\"$JAVA_HOME\"" > ~/.jdk7_home + - name: Set up Java 8 + uses: actions/setup-java@v1 + with: + java-version: 8 + + - name: Capture JDK8_HOME and set it to SDK manager + run: | + echo "export JDK8_HOME=\"$JAVA_HOME\"" > ~/.jdk8_home + sed -i "2i export JAVA_HOME=${JDK8_HOME}" ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager + - name: Set up Java 17 (needed for Spring Boot 3) uses: actions/setup-java@v1 with: From 39daf3567709c520d67b1ef42d872d785f89e76a Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 3 Aug 2024 21:50:22 -0300 Subject: [PATCH 32/40] feat(ci): fix variable --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a7ed6829..f3ac4c47 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,7 +44,7 @@ jobs: - name: Capture JDK8_HOME and set it to SDK manager run: | echo "export JDK8_HOME=\"$JAVA_HOME\"" > ~/.jdk8_home - sed -i "2i export JAVA_HOME=${JDK8_HOME}" ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager + sed -i "2i export JAVA_HOME=${JAVA_HOME}" ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager - name: Set up Java 17 (needed for Spring Boot 3) uses: actions/setup-java@v1 From cfe6388d17cccaa3dcb2f33518f104336de231ac Mon Sep 17 00:00:00 2001 From: chris Date: Tue, 6 Aug 2024 18:23:02 -0300 Subject: [PATCH 33/40] feat(ci): remove third party action --- .github/workflows/ci.yml | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f3ac4c47..51b9fb96 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,12 +18,27 @@ jobs: - name: Fetch git tags run: ./.github/fetch_to_tag.sh - - name: Setup Android SDK - uses: android-actions/setup-android@v3 + # Download and set up an older version of the Android Command Line Tools + - name: Download Android Command Line Tools (older version) + run: | + wget https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip -O commandlinetools.zip + unzip commandlinetools.zip -d ${ANDROID_SDK_ROOT} + rm commandlinetools.zip + + - name: Set up Java 8 + uses: actions/setup-java@v1 with: - cmdline-tools-version: 9477386 + java-version: 8 + - name: Capture JDK8_HOME and set it to SDK manager + run: | + echo "export JDK8_HOME=\"$JAVA_HOME\"" > ~/.jdk8_home + sed -i "2i export JAVA_HOME=${JAVA_HOME}" ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager + - name: Set up Android SDK and install platform-tools + run: | + echo "y" | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --licenses + echo "y" | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager "platform-tools" # Our build uses JDK7's rt.jar to make sure the artifact is fully # compatible with Java 7, so we let this action set Java 7 up for us @@ -36,16 +51,6 @@ jobs: - name: Capture JDK7_HOME run: echo "export JDK7_HOME=\"$JAVA_HOME\"" > ~/.jdk7_home - - name: Set up Java 8 - uses: actions/setup-java@v1 - with: - java-version: 8 - - - name: Capture JDK8_HOME and set it to SDK manager - run: | - echo "export JDK8_HOME=\"$JAVA_HOME\"" > ~/.jdk8_home - sed -i "2i export JAVA_HOME=${JAVA_HOME}" ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager - - name: Set up Java 17 (needed for Spring Boot 3) uses: actions/setup-java@v1 with: From 95fb718f468a594096d7897788bdeb80e04514c1 Mon Sep 17 00:00:00 2001 From: chris Date: Tue, 6 Aug 2024 18:23:55 -0300 Subject: [PATCH 34/40] build: make snapshot --- .github/release.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/release.sh b/.github/release.sh index d4530784..bd77072f 100755 --- a/.github/release.sh +++ b/.github/release.sh @@ -29,24 +29,24 @@ EXPECTED_REF="refs/heads/${BRANCH}" if [[ "$GITHUB_REPOSITORY" != "$REPO" ]]; then echo "Skipping release: wrong repository. Expected '$REPO' but was '$GITHUB_REPOSITORY'." -elif [[ "$IS_PULL_REQUEST" != "false" ]]; then - echo "Skipping release. It was pull request." -elif [[ "$GITHUB_REF" != "$EXPECTED_REF" ]]; then - echo "Skipping release. Expected '$EXPECTED_REF' but was '$GITHUB_REF'." +#elif [[ "$IS_PULL_REQUEST" != "false" ]]; then +# echo "Skipping release. It was pull request." +#elif [[ "$GITHUB_REF" != "$EXPECTED_REF" ]]; then +# echo "Skipping release. Expected '$EXPECTED_REF' but was '$GITHUB_REF'." elif [[ -z $VERSION ]]; then echo "Skipping release. Version value not found." -elif ! [[ $VERSION =~ $SEMVER_REGEX ]]; then - echo "Skipping release. Bad version used." +#elif ! [[ $VERSION =~ $SEMVER_REGEX ]]; then +# echo "Skipping release. Bad version used." else # Gradle needs the absolute path to the secring export GPG_KEY_LOCATION="$(realpath "$GPG_KEY_LOCATION")" - if [[ ${BASH_REMATCH[5]} == 'SNAPSHOT' ]]; then + # if [[ ${BASH_REMATCH[5]} == 'SNAPSHOT' ]]; then echo "Doing SNAPSHOT release..." ./gradlew -Dorg.gradle.internal.http.socketTimeout=300000 -Dorg.gradle.internal.http.connectionTimeout=300000 publishToSonatype - else - echo "Doing release..." - ./gradlew -Dorg.gradle.internal.http.socketTimeout=300000 -Dorg.gradle.internal.http.connectionTimeout=300000 publishToSonatype closeAndReleaseRepository - fi + # else + # echo "Doing release..." + # ./gradlew -Dorg.gradle.internal.http.socketTimeout=300000 -Dorg.gradle.internal.http.connectionTimeout=300000 publishToSonatype closeAndReleaseRepository + # fi echo "Release done!" fi From e95fda5ec04a0154429e38412492a4bf8ff61eeb Mon Sep 17 00:00:00 2001 From: chris Date: Tue, 6 Aug 2024 18:27:13 -0300 Subject: [PATCH 35/40] fix(ci): set command line tool older version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 51b9fb96..cb6c016d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: # Download and set up an older version of the Android Command Line Tools - name: Download Android Command Line Tools (older version) run: | - wget https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip -O commandlinetools.zip + wget https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip -O commandlinetools.zip unzip commandlinetools.zip -d ${ANDROID_SDK_ROOT} rm commandlinetools.zip From f2db24b54320851300684f419cbe993ed0a8b641 Mon Sep 17 00:00:00 2001 From: chris Date: Tue, 6 Aug 2024 18:28:52 -0300 Subject: [PATCH 36/40] fix(ci): set command line tool older version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cb6c016d..f91fe2bc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: # Download and set up an older version of the Android Command Line Tools - name: Download Android Command Line Tools (older version) run: | - wget https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip -O commandlinetools.zip + wget https://dl.google.com/android/repository/commandlinetools-linux-6609375_latest.zip -O commandlinetools.zip unzip commandlinetools.zip -d ${ANDROID_SDK_ROOT} rm commandlinetools.zip From 7f9f2f7054bf537c30e87572af03a3f669bbaa47 Mon Sep 17 00:00:00 2001 From: chris Date: Tue, 6 Aug 2024 18:32:11 -0300 Subject: [PATCH 37/40] fix(ci): remove task --- .github/workflows/ci.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f91fe2bc..92047eb0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,11 +35,6 @@ jobs: echo "export JDK8_HOME=\"$JAVA_HOME\"" > ~/.jdk8_home sed -i "2i export JAVA_HOME=${JAVA_HOME}" ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager - - name: Set up Android SDK and install platform-tools - run: | - echo "y" | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --licenses - echo "y" | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager "platform-tools" - # Our build uses JDK7's rt.jar to make sure the artifact is fully # compatible with Java 7, so we let this action set Java 7 up for us # and we store its JAVA_HOME From c93d056a84576187f81fbcfa0f7edd19d2ade876 Mon Sep 17 00:00:00 2001 From: chris Date: Tue, 6 Aug 2024 22:34:25 -0300 Subject: [PATCH 38/40] fix(ci): try to make snapshot with previous solution --- .github/workflows/ci.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 92047eb0..aaac6dd5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,12 +18,10 @@ jobs: - name: Fetch git tags run: ./.github/fetch_to_tag.sh - # Download and set up an older version of the Android Command Line Tools - - name: Download Android Command Line Tools (older version) - run: | - wget https://dl.google.com/android/repository/commandlinetools-linux-6609375_latest.zip -O commandlinetools.zip - unzip commandlinetools.zip -d ${ANDROID_SDK_ROOT} - rm commandlinetools.zip + - name: Setup Android SDK + uses: android-actions/setup-android@v3 + with: + cmdline-tools-version: 9477386 - name: Set up Java 8 uses: actions/setup-java@v1 From b56d80db31ab1f6e0aad411ce86cd1068ca7b5d0 Mon Sep 17 00:00:00 2001 From: chris Date: Wed, 7 Aug 2024 12:17:44 -0300 Subject: [PATCH 39/40] remove condition just for testing release --- .github/workflows/ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aaac6dd5..d4024152 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -133,9 +133,8 @@ jobs: NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }} NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} run: | - if test "$GITHUB_REPOSITORY" = "rollbar/rollbar-java" -a "$GITHUB_BASE_REF" = ""; then - openssl enc -aes-256-cbc -K "$SECRING_GPG_KEY" -iv "$SECRING_GPG_IV" -in "$ENCRYPTED_GPG_KEY_LOCATION" -out "$GPG_KEY_LOCATION" -d - fi && + openssl enc -aes-256-cbc -K "$SECRING_GPG_KEY" -iv "$SECRING_GPG_IV" -in "$ENCRYPTED_GPG_KEY_LOCATION" -out "$GPG_KEY_LOCATION" -d + && source ~/.jdk7_home && ./.github/release.sh From b44e278ad07eff31a7d2e69e696429725e8788d7 Mon Sep 17 00:00:00 2001 From: chris Date: Mon, 12 Aug 2024 14:53:51 -0300 Subject: [PATCH 40/40] refactor: remove third party action --- .github/workflows/ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d4024152..8421d9d4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,9 +19,8 @@ jobs: run: ./.github/fetch_to_tag.sh - name: Setup Android SDK - uses: android-actions/setup-android@v3 - with: - cmdline-tools-version: 9477386 + run: | + ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "platforms;android-27" "build-tools;28.0.3" - name: Set up Java 8 uses: actions/setup-java@v1