From a4a57747780bd3d5dd29d91d3dad0d0dac3e1360 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 31 Oct 2023 16:45:56 +0100 Subject: [PATCH] .gitlab-ci.yml: inline `before_script` and `after_script` into `script` blocks --- .gitlab-ci.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00b27b2..36aae19 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,18 +2,14 @@ variables: GIT_SUBMODULE_STRATEGY: recursive ANDROID_HOME: $PWD/android-sdk -before_script: - - apt-get update - -after_script: - - gradle --version - bullseye-jdk11: image: debian:bullseye-backports script: + - apt-get update - apt-get -y install openjdk-11-jdk-headless gradle sdkmanager - yes | sdkmanager --licenses >/dev/null || true - gradle build --stacktrace + - gradle --version artifacts: name: oeffi-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA paths: @@ -22,9 +18,11 @@ bullseye-jdk11: bookworm-jdk17: image: debian:bookworm-slim script: + - apt-get update - apt-get -y install openjdk-17-jdk-headless gradle sdkmanager - yes | sdkmanager --licenses >/dev/null || true - gradle build --stacktrace + - gradle --version artifacts: name: oeffi-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA paths: @@ -33,9 +31,11 @@ bookworm-jdk17: jammy-jdk11: image: ubuntu:jammy script: + - apt-get update - apt-get -y install openjdk-11-jdk-headless gradle sdkmanager - yes | sdkmanager --licenses >/dev/null || true - gradle build --stacktrace + - gradle --version artifacts: name: oeffi-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA paths: @@ -44,9 +44,11 @@ jammy-jdk11: lunar-jdk17: image: ubuntu:lunar script: + - apt-get update - apt-get -y install openjdk-17-jdk-headless gradle sdkmanager - yes | sdkmanager --licenses >/dev/null || true - gradle build --stacktrace + - gradle --version artifacts: name: oeffi-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA paths: