From 933d8304e5349470657384107bb55f192c8d7141 Mon Sep 17 00:00:00 2001 From: Kerboul Date: Tue, 10 Dec 2024 15:17:06 +0000 Subject: [PATCH 01/15] Update .gitlab-ci.yml (build) --- .gitlab-ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d562e78..3c3243d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,14 @@ variables: ANDROID_HOME: "/root/Android/Sdk" # Ajoutez cette ligne GRADLE_USER_HOME: "$CI_PROJECT_DIR/.gradle" +before_script: + - apt-get update -qq && apt-get install -qq -y openjdk-11-jdk wget unzip + - wget https://dl.google.com/android/repository/commandlinetools-linux-7302050_latest.zip -O android-commandlinetools.zip + - mkdir -p $ANDROID_SDK_ROOT/cmdline-tools + - unzip android-commandlinetools.zip -d $ANDROID_SDK_ROOT/cmdline-tools + - yes | $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager --licenses + - $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager "platforms;android-30" "build-tools;30.0.3" + build-apk: stage: build script: From 13f9cefece0a3b866a987b4e8f57fc3e49c24539 Mon Sep 17 00:00:00 2001 From: Kerboul Date: Tue, 10 Dec 2024 15:18:45 +0000 Subject: [PATCH 02/15] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3c3243d..80c6e7d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,8 @@ variables: ANDROID_HOME: "/root/Android/Sdk" # Ajoutez cette ligne GRADLE_USER_HOME: "$CI_PROJECT_DIR/.gradle" +image: ubuntu:20.04 + before_script: - apt-get update -qq && apt-get install -qq -y openjdk-11-jdk wget unzip - wget https://dl.google.com/android/repository/commandlinetools-linux-7302050_latest.zip -O android-commandlinetools.zip From 4763d6d0b1d5a7a1c8e621615692c0081be30d97 Mon Sep 17 00:00:00 2001 From: Kerboul Date: Tue, 10 Dec 2024 15:19:38 +0000 Subject: [PATCH 03/15] Update .gitlab-ci.yml (build) --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 80c6e7d..c705f09 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,8 +2,8 @@ stages: - build variables: - ANDROID_SDK_ROOT: "/root/Android/Sdk" # Mettez à jour ce chemin - ANDROID_HOME: "/root/Android/Sdk" # Ajoutez cette ligne + ANDROID_SDK_ROOT: "/root/Android/Sdk" + ANDROID_HOME: "/root/Android/Sdk" GRADLE_USER_HOME: "$CI_PROJECT_DIR/.gradle" image: ubuntu:20.04 From 1de5351b62560a0cf7756c732d24bfc71e4719d8 Mon Sep 17 00:00:00 2001 From: Kerboul Date: Tue, 10 Dec 2024 15:27:51 +0000 Subject: [PATCH 04/15] Update file .gitlab-ci.yml --- .gitlab-ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c705f09..b201e29 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,17 +2,18 @@ stages: - build variables: - ANDROID_SDK_ROOT: "/root/Android/Sdk" - ANDROID_HOME: "/root/Android/Sdk" + ANDROID_SDK_ROOT: "/root/Android/Sdk" # Mettez à jour ce chemin + ANDROID_HOME: "/root/Android/Sdk" # Ajoutez cette ligne GRADLE_USER_HOME: "$CI_PROJECT_DIR/.gradle" image: ubuntu:20.04 before_script: - apt-get update -qq && apt-get install -qq -y openjdk-11-jdk wget unzip - - wget https://dl.google.com/android/repository/commandlinetools-linux-7302050_latest.zip -O android-commandlinetools.zip + - wget https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip -O android-commandlinetools.zip - mkdir -p $ANDROID_SDK_ROOT/cmdline-tools - unzip android-commandlinetools.zip -d $ANDROID_SDK_ROOT/cmdline-tools + - mv $ANDROID_SDK_ROOT/cmdline-tools/cmdline-tools $ANDROID_SDK_ROOT/cmdline-tools/tools - yes | $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager --licenses - $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager "platforms;android-30" "build-tools;30.0.3" From 0302b35f5e277c5226e96ba47ec127e1139f3bc6 Mon Sep 17 00:00:00 2001 From: Kerboul Date: Tue, 10 Dec 2024 15:28:01 +0000 Subject: [PATCH 05/15] build --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b201e29..9b17817 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ stages: - build variables: - ANDROID_SDK_ROOT: "/root/Android/Sdk" # Mettez à jour ce chemin + ANDROID_SDK_ROOT: "/root/Android/Sdk" ANDROID_HOME: "/root/Android/Sdk" # Ajoutez cette ligne GRADLE_USER_HOME: "$CI_PROJECT_DIR/.gradle" From dc51186c789a9e309856aaa9a0798b1cd9dcf769 Mon Sep 17 00:00:00 2001 From: Kerboul Date: Tue, 10 Dec 2024 15:30:44 +0000 Subject: [PATCH 06/15] New build --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9b17817..cdb4c36 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,7 @@ variables: image: ubuntu:20.04 before_script: - - apt-get update -qq && apt-get install -qq -y openjdk-11-jdk wget unzip + - apt-get update -qq && apt-get install -qq -y openjdk-17-jdk wget unzip - wget https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip -O android-commandlinetools.zip - mkdir -p $ANDROID_SDK_ROOT/cmdline-tools - unzip android-commandlinetools.zip -d $ANDROID_SDK_ROOT/cmdline-tools From 6e37d281dd73b4bfe89f0b1880959dfe45b63b16 Mon Sep 17 00:00:00 2001 From: Kerboul Date: Tue, 10 Dec 2024 15:33:35 +0000 Subject: [PATCH 07/15] Test build --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cdb4c36..5c3843b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,9 @@ before_script: - mkdir -p $ANDROID_SDK_ROOT/cmdline-tools - unzip android-commandlinetools.zip -d $ANDROID_SDK_ROOT/cmdline-tools - mv $ANDROID_SDK_ROOT/cmdline-tools/cmdline-tools $ANDROID_SDK_ROOT/cmdline-tools/tools - - yes | $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager --licenses + - mkdir -p $ANDROID_SDK_ROOT/licenses + - echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > $ANDROID_SDK_ROOT/licenses/android-sdk-license + - echo "d56f5187479451eabf01fb78af6dfcb131a6481e" >> $ANDROID_SDK_ROOT/licenses/android-sdk-license - $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager "platforms;android-30" "build-tools;30.0.3" build-apk: From 43b933bf6aef5c82d4a2799f1b1f9dfb1091c48a Mon Sep 17 00:00:00 2001 From: Kerboul Date: Tue, 10 Dec 2024 15:40:42 +0000 Subject: [PATCH 08/15] Test final (build) --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5c3843b..d4ff710 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,8 @@ before_script: - mkdir -p $ANDROID_SDK_ROOT/licenses - echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > $ANDROID_SDK_ROOT/licenses/android-sdk-license - echo "d56f5187479451eabf01fb78af6dfcb131a6481e" >> $ANDROID_SDK_ROOT/licenses/android-sdk-license - - $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager "platforms;android-30" "build-tools;30.0.3" + - echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > $ANDROID_SDK_ROOT/licenses/android-sdk-preview-license + - $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager "platforms;android-30" "build-tools;30.0.3" "platforms;android-34" "build-tools;34.0.0" build-apk: stage: build From 3ee66371292d90353516a1a08bbaeabbc8fe1227 Mon Sep 17 00:00:00 2001 From: Kerboul Date: Tue, 10 Dec 2024 15:45:36 +0000 Subject: [PATCH 09/15] =?UTF-8?q?build=20=C3=A0=20nouveau?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d4ff710..1cb8973 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,6 +18,7 @@ before_script: - echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > $ANDROID_SDK_ROOT/licenses/android-sdk-license - echo "d56f5187479451eabf01fb78af6dfcb131a6481e" >> $ANDROID_SDK_ROOT/licenses/android-sdk-license - echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > $ANDROID_SDK_ROOT/licenses/android-sdk-preview-license + - yes | $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager --licenses - $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager "platforms;android-30" "build-tools;30.0.3" "platforms;android-34" "build-tools;34.0.0" build-apk: From 466c2fb50c2464d259ddf3595020a9534091191f Mon Sep 17 00:00:00 2001 From: Kerboul Date: Tue, 10 Dec 2024 15:52:59 +0000 Subject: [PATCH 10/15] build test --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1cb8973..35e0750 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,11 +15,11 @@ before_script: - unzip android-commandlinetools.zip -d $ANDROID_SDK_ROOT/cmdline-tools - mv $ANDROID_SDK_ROOT/cmdline-tools/cmdline-tools $ANDROID_SDK_ROOT/cmdline-tools/tools - mkdir -p $ANDROID_SDK_ROOT/licenses + - $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager "platforms;android-30" "build-tools;30.0.3" "platforms;android-34" "build-tools;34.0.0" - echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > $ANDROID_SDK_ROOT/licenses/android-sdk-license - echo "d56f5187479451eabf01fb78af6dfcb131a6481e" >> $ANDROID_SDK_ROOT/licenses/android-sdk-license - echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > $ANDROID_SDK_ROOT/licenses/android-sdk-preview-license - yes | $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager --licenses - - $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager "platforms;android-30" "build-tools;30.0.3" "platforms;android-34" "build-tools;34.0.0" build-apk: stage: build From 5f1cf24a3405f6807b3c84682b50ffc9072265ff Mon Sep 17 00:00:00 2001 From: Kerboul Date: Tue, 10 Dec 2024 16:00:14 +0000 Subject: [PATCH 11/15] skibidi build --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 35e0750..d289658 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,11 +15,11 @@ before_script: - unzip android-commandlinetools.zip -d $ANDROID_SDK_ROOT/cmdline-tools - mv $ANDROID_SDK_ROOT/cmdline-tools/cmdline-tools $ANDROID_SDK_ROOT/cmdline-tools/tools - mkdir -p $ANDROID_SDK_ROOT/licenses - - $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager "platforms;android-30" "build-tools;30.0.3" "platforms;android-34" "build-tools;34.0.0" - echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > $ANDROID_SDK_ROOT/licenses/android-sdk-license - echo "d56f5187479451eabf01fb78af6dfcb131a6481e" >> $ANDROID_SDK_ROOT/licenses/android-sdk-license - echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > $ANDROID_SDK_ROOT/licenses/android-sdk-preview-license - - yes | $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager --licenses + - $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager --update + - $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager "platforms;android-30" "build-tools;30.0.3" "platforms;android-34" "build-tools;34.0.0" build-apk: stage: build From 934fdb666e2ff0d088a160b8bef5d7999bdd99fb Mon Sep 17 00:00:00 2001 From: Kerboul Date: Tue, 10 Dec 2024 16:03:32 +0000 Subject: [PATCH 12/15] skibidi dop dop fanum fax build --- .gitlab-ci.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d289658..a2c24c2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,22 +3,27 @@ stages: variables: ANDROID_SDK_ROOT: "/root/Android/Sdk" - ANDROID_HOME: "/root/Android/Sdk" # Ajoutez cette ligne + ANDROID_HOME: "/root/Android/Sdk" GRADLE_USER_HOME: "$CI_PROJECT_DIR/.gradle" image: ubuntu:20.04 before_script: + # Installer Java, SDK tools et dépendances - apt-get update -qq && apt-get install -qq -y openjdk-17-jdk wget unzip - wget https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip -O android-commandlinetools.zip - mkdir -p $ANDROID_SDK_ROOT/cmdline-tools - unzip android-commandlinetools.zip -d $ANDROID_SDK_ROOT/cmdline-tools - mv $ANDROID_SDK_ROOT/cmdline-tools/cmdline-tools $ANDROID_SDK_ROOT/cmdline-tools/tools - mkdir -p $ANDROID_SDK_ROOT/licenses + # Ajouter les hashes de licences nécessaires - echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > $ANDROID_SDK_ROOT/licenses/android-sdk-license - echo "d56f5187479451eabf01fb78af6dfcb131a6481e" >> $ANDROID_SDK_ROOT/licenses/android-sdk-license - echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > $ANDROID_SDK_ROOT/licenses/android-sdk-preview-license + - echo "84831b9409646a918e30573bab4c9c91346d8abd" >> $ANDROID_SDK_ROOT/licenses/android-sdk-license # License supplémentaire pour certaines versions + - echo "604e1f9ac365a509d1554b6a3c403ccaa08a7e8d" >> $ANDROID_SDK_ROOT/licenses/android-sdk-license # License pour build-tools 34.x - $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager --update + # Installer les plateformes et outils nécessaires - $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager "platforms;android-30" "build-tools;30.0.3" "platforms;android-34" "build-tools;34.0.0" build-apk: @@ -32,6 +37,6 @@ build-apk: - ./gradlew assembleDebug # ou assembleRelease pour un APK de production artifacts: paths: - - app/build/outputs/apk/debug/*.apk # Chemin vers le fichier APK généré + - app/build/outputs/apk/debug/*.apk rules: - if: '$CI_COMMIT_BRANCH == "master" && $CI_COMMIT_MESSAGE =~ /build/' From 882aaf462747fa95fec4bc58c21408d249911d35 Mon Sep 17 00:00:00 2001 From: Kerboul Date: Tue, 10 Dec 2024 16:06:46 +0000 Subject: [PATCH 13/15] =?UTF-8?q?build=20isr=C3=A9el?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a2c24c2..79641a5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,15 +16,8 @@ before_script: - unzip android-commandlinetools.zip -d $ANDROID_SDK_ROOT/cmdline-tools - mv $ANDROID_SDK_ROOT/cmdline-tools/cmdline-tools $ANDROID_SDK_ROOT/cmdline-tools/tools - mkdir -p $ANDROID_SDK_ROOT/licenses - # Ajouter les hashes de licences nécessaires - - echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > $ANDROID_SDK_ROOT/licenses/android-sdk-license - - echo "d56f5187479451eabf01fb78af6dfcb131a6481e" >> $ANDROID_SDK_ROOT/licenses/android-sdk-license - - echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > $ANDROID_SDK_ROOT/licenses/android-sdk-preview-license - - echo "84831b9409646a918e30573bab4c9c91346d8abd" >> $ANDROID_SDK_ROOT/licenses/android-sdk-license # License supplémentaire pour certaines versions - - echo "604e1f9ac365a509d1554b6a3c403ccaa08a7e8d" >> $ANDROID_SDK_ROOT/licenses/android-sdk-license # License pour build-tools 34.x - - $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager --update - # Installer les plateformes et outils nécessaires - - $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager "platforms;android-30" "build-tools;30.0.3" "platforms;android-34" "build-tools;34.0.0" + - yes | $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager --licenses + - $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager "platforms;android-34" "build-tools;34.0.0" build-apk: stage: build From bb65e6f41cc6fc1d5a96555659922f3038429272 Mon Sep 17 00:00:00 2001 From: Kerboul Date: Tue, 10 Dec 2024 16:09:19 +0000 Subject: [PATCH 14/15] build du boulistan --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 79641a5..c1ddf10 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,8 @@ before_script: - unzip android-commandlinetools.zip -d $ANDROID_SDK_ROOT/cmdline-tools - mv $ANDROID_SDK_ROOT/cmdline-tools/cmdline-tools $ANDROID_SDK_ROOT/cmdline-tools/tools - mkdir -p $ANDROID_SDK_ROOT/licenses - - yes | $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager --licenses + # Accepter toutes les licences sans erreur bloquante + - yes | $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager --licenses || true - $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager "platforms;android-34" "build-tools;34.0.0" build-apk: From 12b004cd2e6cd1099765daae22ba7240065ba973 Mon Sep 17 00:00:00 2001 From: Kerboul Date: Tue, 10 Dec 2024 16:14:44 +0000 Subject: [PATCH 15/15] Skibidi build de trop --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c1ddf10..fd85b89 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ before_script: - mkdir -p $ANDROID_SDK_ROOT/licenses # Accepter toutes les licences sans erreur bloquante - yes | $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager --licenses || true - - $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager "platforms;android-34" "build-tools;34.0.0" + - $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager "platforms;android-30" "build-tools;30.0.3" "platforms;android-34" "build-tools;34.0.0" build-apk: stage: build