From 79fefd14448c08ca613f921376c54d35738f3882 Mon Sep 17 00:00:00 2001 From: vincent Bourgmayer Date: Mon, 4 Nov 2024 11:43:50 +0100 Subject: [PATCH 1/2] chore: update .gitlab-ci to remove before_scripts step in releasing jobs --- .gitlab-ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e229f21d9..a1cf60c4c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -265,8 +265,6 @@ create-json-files: rules: - if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"' when: on_success - before_script: - - apt update && apt install jq aapt -y script: - | ./systemAppsUpdateInfo/scripts/create-json-files.sh \ @@ -288,8 +286,6 @@ create-test-release: rules: - if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"' when: manual - before_script: - - apt update && apt install jq -y script: - | ./systemAppsUpdateInfo/scripts/create-test-release.sh \ @@ -307,8 +303,6 @@ create-release: rules: - if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"' when: manual - before_script: - - apt update && apt install jq -y script: - | ./systemAppsUpdateInfo/scripts/create-release.sh \ -- GitLab From a0b81f41a79e76c9ebcf0178d9831b4642b61559 Mon Sep 17 00:00:00 2001 From: vincent Bourgmayer Date: Tue, 5 Nov 2024 15:52:14 +0100 Subject: [PATCH 2/2] chore: remove openssh installation from update-from-upstream job as suggested by reviewer --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a1cf60c4c..7826a54dd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -167,7 +167,6 @@ pushToPrebuilt: variables: NEW_APK_PATH: "app/build/outputs/apk/release/" before_script: - - 'which ssh-agent || ( apt update -y && apt install openssh-client -y )' - eval $(ssh-agent -s) - echo "$SSH_E_ROBOT_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null - mkdir -p ~/.ssh -- GitLab