From bc3dd8bbafbcada84f5ea1e4c56947464d5fb11e Mon Sep 17 00:00:00 2001 From: vincent Bourgmayer Date: Mon, 4 Nov 2024 10:48:19 +0100 Subject: [PATCH 1/2] chore: update .gitlab-ci to remove before_scripts step in releasing jobs --- .gitlab-ci.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 46569f60df..0747246110 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -66,8 +66,6 @@ generate-apks: dependencies: - init_submodules - build - before_script: - - apt update && apt install apksigner -y script: - | ./systemAppsUpdateInfo/scripts/generate-apks.sh \ @@ -90,8 +88,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 \ @@ -113,8 +109,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 \ @@ -132,8 +126,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 afd1d18740e8bdb083248adaf00bee1b169eaeaa Mon Sep 17 00:00:00 2001 From: vincent Bourgmayer Date: Mon, 4 Nov 2024 15:09:03 +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 0747246110..e0a4f000e0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -141,7 +141,6 @@ create-release: CI_PROJECT_SSH_URL: git@gitlab.e.foundation:$CI_PROJECT_PATH GIT_STRATEGY: none before_script: - - 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )' - eval $(ssh-agent -s) - echo "${SSH_E_ROBOT_PRIVATE_KEY}" | tr -d '\r' | ssh-add - - mkdir -p ~/.ssh -- GitLab