From 956ed7b50c1b6c88a9aa5ff818b0e0c33f570a0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20H=C3=B6hn?= Date: Mon, 23 Dec 2024 23:54:09 +0100 Subject: [PATCH 1/7] test fix for fdroid --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0b7a07d17d..74bea1eba3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -144,6 +144,7 @@ jobs: git ls-remote https://gitlab.com/fdroid/fdroidserver.git master curl --silent https://gitlab.com/fdroid/fdroidserver/-/archive/master/fdroidserver-master.tar.gz | tar -xz --directory=$fdroidserver --strip-components=1 chown -R vagrant $fdroidserver + pip install tomblib # TODO remove sdkmanager install once it is included in the buildserver image apt-get install sdkmanager From 57e9f5f41add90caed248de86955f29d8d8cbc8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20H=C3=B6hn?= Date: Mon, 23 Dec 2024 23:58:04 +0100 Subject: [PATCH 2/7] add pip for installing package --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 74bea1eba3..f348b61f4c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -135,6 +135,7 @@ jobs: # Mostly copied from fdroidserver’s own CI script (fdroid build), except for everything marked APP_CI apt-get update apt-get dist-upgrade + apt-get install python3-pip apt-get clean test -n "$fdroidserver" || source /etc/profile.d/bsenv.sh From b5a04c56d0956fa3837282f1082e912fe5765211 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20H=C3=B6hn?= Date: Tue, 24 Dec 2024 00:01:23 +0100 Subject: [PATCH 3/7] fix typo --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f348b61f4c..18b2ea763e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -145,7 +145,7 @@ jobs: git ls-remote https://gitlab.com/fdroid/fdroidserver.git master curl --silent https://gitlab.com/fdroid/fdroidserver/-/archive/master/fdroidserver-master.tar.gz | tar -xz --directory=$fdroidserver --strip-components=1 chown -R vagrant $fdroidserver - pip install tomblib + pip install tomllib # TODO remove sdkmanager install once it is included in the buildserver image apt-get install sdkmanager From a418fc44642f616ee70b90a40800bd71588665e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20H=C3=B6hn?= Date: Tue, 24 Dec 2024 00:10:31 +0100 Subject: [PATCH 4/7] switch fdroid-server image to bookworm from bullseye, since newer python version is required --- .circleci/config.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 18b2ea763e..c1f926f2f0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -126,7 +126,7 @@ jobs: bash scripts/update_download_center.sh build_fdroid: docker: - - image: registry.gitlab.com/fdroid/fdroidserver:buildserver-bullseye + - image: registry.gitlab.com/fdroid/fdroidserver:buildserver-bookworm steps: - checkout - run: @@ -135,7 +135,6 @@ jobs: # Mostly copied from fdroidserver’s own CI script (fdroid build), except for everything marked APP_CI apt-get update apt-get dist-upgrade - apt-get install python3-pip apt-get clean test -n "$fdroidserver" || source /etc/profile.d/bsenv.sh @@ -145,7 +144,6 @@ jobs: git ls-remote https://gitlab.com/fdroid/fdroidserver.git master curl --silent https://gitlab.com/fdroid/fdroidserver/-/archive/master/fdroidserver-master.tar.gz | tar -xz --directory=$fdroidserver --strip-components=1 chown -R vagrant $fdroidserver - pip install tomllib # TODO remove sdkmanager install once it is included in the buildserver image apt-get install sdkmanager From e7e240c4f4ccb4644a3dfc89d22c8109c31bf877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20H=C3=B6hn?= Date: Tue, 24 Dec 2024 00:15:37 +0100 Subject: [PATCH 5/7] testing commit to avoid git issue --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index c1f926f2f0..f9ee20a647 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -136,6 +136,7 @@ jobs: apt-get update apt-get dist-upgrade apt-get clean + git config --global --add safe.directory /root/project/.git test -n "$fdroidserver" || source /etc/profile.d/bsenv.sh From d406ee17d46241d9f3457be59ef1993f2c996eb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20H=C3=B6hn?= Date: Tue, 24 Dec 2024 00:34:11 +0100 Subject: [PATCH 6/7] try to find problematic line --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f9ee20a647..5d3e7d7c81 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -136,7 +136,6 @@ jobs: apt-get update apt-get dist-upgrade apt-get clean - git config --global --add safe.directory /root/project/.git test -n "$fdroidserver" || source /etc/profile.d/bsenv.sh @@ -180,7 +179,7 @@ jobs: chown -R vagrant $home_vagrant # APP_CI: just build our own app - $fdroid build --verbose --on-server --no-tarball + #$fdroid build --verbose --on-server --no-tarball - store_artifacts: name: Store APK path: unsigned From b1b90ad55a7ec23aa881d73e0539e74b3231fbdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20H=C3=B6hn?= Date: Tue, 24 Dec 2024 00:36:16 +0100 Subject: [PATCH 7/7] remove checkout step --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5d3e7d7c81..669e016f7d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -128,7 +128,6 @@ jobs: docker: - image: registry.gitlab.com/fdroid/fdroidserver:buildserver-bookworm steps: - - checkout - run: name: Build with F-Droid command: | @@ -179,7 +178,7 @@ jobs: chown -R vagrant $home_vagrant # APP_CI: just build our own app - #$fdroid build --verbose --on-server --no-tarball + $fdroid build --verbose --on-server --no-tarball - store_artifacts: name: Store APK path: unsigned