From 59f61aa5e156f9fb3afd89fb2c66e7e453366a88 Mon Sep 17 00:00:00 2001 From: Jackeagle Date: Wed, 29 May 2024 09:59:32 -0400 Subject: [PATCH 1/8] easy-installer: Start using Workspace instead of root for everything - Some improvements Signed-off-by: Jackeagle --- .gitlab-ci.yml | 45 ++++++++++++++++++++------------------------- Dockerfile | 18 +++++++++++------- 2 files changed, 31 insertions(+), 32 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5ed66462..aac40cc8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,13 +4,13 @@ variables: CONTAINER_TAG: stable stages: -- test -- prepare -- build -- publish + - test + - prepare + - build + - publish check-version: - image: registry.gitlab.e.foundation/e/devices/easy-installer:stable + image: $CONTAINER_IMAGE:$CONTAINER_TAG stage: test script: - ./version.sh check @@ -39,10 +39,6 @@ build-docker: when: manual build-aur-docker: -# build AUR docker image -# the image is different from the build-docker (which using docker:19) step as -# archlinux/archlinux docker image fails with -# error: failed to initialize alpm library: image: docker:20 stage: prepare services: @@ -63,11 +59,11 @@ build-aur-docker: when: manual build-snap: - image: registry.gitlab.e.foundation/e/devices/easy-installer:stable + image: $CONTAINER_IMAGE:$CONTAINER_TAG stage: build - variables: - GIT_SUBMODULE_STRATEGY: recursive script: + - cp -r $CI_PROJECT_DIR/* /Workspace/ + - cd /Workspace - snapcraft - ls artifacts: @@ -76,11 +72,11 @@ build-snap: - easy-installer*.snap build-linux-x64: - image: registry.gitlab.e.foundation/e/devices/easy-installer:stable + image: $CONTAINER_IMAGE:$CONTAINER_TAG stage: build - variables: - GIT_SUBMODULE_STRATEGY: recursive script: + - cp -r $CI_PROJECT_DIR/* /Workspace/ + - cd /Workspace - ./gradlew dist artifacts: name: "easy-installer-$CI_COMMIT_TAG-linux_x64" @@ -90,11 +86,11 @@ build-linux-x64: - if: $CI_COMMIT_TAG build-windows: - image: registry.gitlab.e.foundation/e/devices/easy-installer:stable + image: $CONTAINER_IMAGE:$CONTAINER_TAG stage: build - variables: - GIT_SUBMODULE_STRATEGY: recursive script: + - cp -r $CI_PROJECT_DIR/* /Workspace/ + - cd /Workspace - ./gradlew jlink -Pkey="$PEPPER" - makensis windows-installer-mui.nsi - sha256sum Easy-installer-setup.exe > Easy-installer-setup.exe.sha256sum @@ -105,13 +101,13 @@ build-windows: - Easy-installer-setup.exe.sha256sum build-macos: - image: registry.gitlab.e.foundation/e/devices/easy-installer:stable + image: $CONTAINER_IMAGE:$CONTAINER_TAG tags: - generic_privileged stage: build - variables: - GIT_SUBMODULE_STRATEGY: recursive script: + - cp -r $CI_PROJECT_DIR/* /Workspace/ + - cd /Workspace - ./gradlew jlink - cd Mac-build - ./mac_package.sh @@ -135,7 +131,7 @@ build-aur: - dist/*.pkg.tar.zst publish-ubuntu: - image: registry.gitlab.e.foundation/e/devices/easy-installer:stable + image: $CONTAINER_IMAGE:$CONTAINER_TAG stage: publish needs: ["build-snap"] variables: @@ -148,9 +144,8 @@ publish-ubuntu: - if: '$CI_COMMIT_TAG' when: manual - publish-macos: - image: registry.gitlab.e.foundation/e/devices/easy-installer:stable + image: $CONTAINER_IMAGE:$CONTAINER_TAG stage: publish needs: ["build-macos"] variables: @@ -171,7 +166,7 @@ publish-macos: when: manual publish-windows: - image: registry.gitlab.e.foundation/e/devices/easy-installer:stable + image: $CONTAINER_IMAGE:$CONTAINER_TAG stage: publish needs: ["build-windows"] variables: diff --git a/Dockerfile b/Dockerfile index d6b726fa..3d406b14 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,19 @@ FROM snapcore/snapcraft:stable as builder FROM ubuntu:bionic + COPY --from=builder /snap/core /snap/core COPY --from=builder /snap/core18 /snap/core18 COPY --from=builder /snap/snapcraft /snap/snapcraft COPY --from=builder /snap/bin/snapcraft /snap/bin/snapcraft +# Install necessary packages +RUN apt-get update && apt-get dist-upgrade --yes && \ + apt-get install --yes snapd sudo locales && \ + locale-gen en_US.UTF-8 && \ + apt-get install --yes iputils-ping wget unzip gcc nsis rsync hfsprogs hfsplus -# Generate locale. -RUN apt-get update && apt-get dist-upgrade --yes && apt-get install --yes snapd sudo locales && locale-gen en_US.UTF-8 - -# Set the proper environment. +# Set the proper environment ENV LANG="en_US.UTF-8" ENV LANGUAGE="en_US:en" ENV LC_ALL="en_US.UTF-8" @@ -19,8 +22,9 @@ ENV SNAP="/snap/snapcraft/current" ENV SNAP_NAME="snapcraft" ENV SNAP_ARCH="amd64" -RUN apt-get install -y nsis rsync hfsprogs hfsplus - -# install jvm +# Install JVM COPY buildSrc/linux/jdk-11.0.2 /usr/lib/jdk/jdk-11.0.2 ENV JAVA_HOME=/usr/lib/jdk/jdk-11.0.2 + +# Set the working directory to /Workspace +WORKDIR /Workspace -- GitLab From 757a4e13ec0f485f42707ccd90e4310edceac04b Mon Sep 17 00:00:00 2001 From: Jackeagle Date: Wed, 29 May 2024 11:07:25 -0400 Subject: [PATCH 2/8] ci: Switch to beta registry container Signed-off-by: Jackeagle --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aac40cc8..57f83873 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ variables: GIT_SUBMODULE_STRATEGY: recursive CONTAINER_IMAGE: registry.gitlab.e.foundation/e/devices/easy-installer - CONTAINER_TAG: stable + CONTAINER_TAG: beta stages: - test -- GitLab From 15b6f89ece34377b0da795c358ae4f0fadf6261e Mon Sep 17 00:00:00 2001 From: Jackeagle Date: Thu, 30 May 2024 09:29:11 -0400 Subject: [PATCH 3/8] Gradle: Setup gradle env within docker container - This improves build reliability and reduces network dependencies. - Update gradle wrapper distributionUrl. Signed-off-by: Jackeagle --- Dockerfile | 12 ++++++++++++ gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3d406b14..26faff61 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,5 +26,17 @@ ENV SNAP_ARCH="amd64" COPY buildSrc/linux/jdk-11.0.2 /usr/lib/jdk/jdk-11.0.2 ENV JAVA_HOME=/usr/lib/jdk/jdk-11.0.2 +# Download Gradle ZIP file into the container +ADD https://github.com/gradle/gradle-distributions/releases/download/v4.10.2/gradle-4.10.2-bin.zip /tmp/ + +# Extract Gradle +RUN mkdir -p /usr/local/gradle && \ + unzip /tmp/gradle-4.10.2-bin.zip -d /usr/local/gradle && \ + rm /tmp/gradle-4.10.2-bin.zip + +# Set Gradle environment variables +ENV GRADLE_HOME=/usr/local/gradle/gradle-4.10.2 +ENV PATH=$GRADLE_HOME/bin:$PATH + # Set the working directory to /Workspace WORKDIR /Workspace diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e0b3fb8d..ddb9820b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip +distributionUrl=https\://github.com/gradle/gradle-distributions/releases/download/v4.10.2/gradle-4.10.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -- GitLab From 368113dce11d72c80a152c5f9ddd5d0ddd899419 Mon Sep 17 00:00:00 2001 From: Jackeagle Date: Wed, 29 May 2024 23:03:17 -0400 Subject: [PATCH 4/8] gradle: Drop all TLS properties Signed-off-by: Jackeagle --- gradle.properties | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/gradle.properties b/gradle.properties index 735f57b4..f919820e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,22 +5,6 @@ # local Maven project. version=1.0 -# Configure allowed TLS protocols for secure HTTPS connections -Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2 - -# Specify Java system property to enforce TLSv1.2 protocol for HTTPS connections -JAVA_TOOL_OPTIONS=-Dhttps.protocols=TLSv1.2 - -# Configure HTTP proxy settings -systemProp.http.proxyHost=fodev.org -systemProp.http.proxyPort=8118 -systemProp.http.nonProxyHosts=*.jitpack.io, *.maven.org - -# Configure HTTPS proxy settings -systemProp.https.proxyHost=fodev.org -systemProp.https.proxyPort=8118 -systemProp.https.nonProxyHosts=*.jitpack.io, *.maven.org - # Increase HTTP connection timeout to 10 minutes systemProp.http.connectionTimeout=600000 -- GitLab From 5cd96dcf44884a7a94c439a8a535b92c7b6e07f9 Mon Sep 17 00:00:00 2001 From: Jackeagle Date: Wed, 29 May 2024 23:50:49 -0400 Subject: [PATCH 5/8] ci: Adapt to new Workspace location Signed-off-by: Jackeagle --- .gitlab-ci.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 57f83873..0b307f1c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,11 +61,14 @@ build-aur-docker: build-snap: image: $CONTAINER_IMAGE:$CONTAINER_TAG stage: build + variables: + GIT_SUBMODULE_STRATEGY: recursive script: - cp -r $CI_PROJECT_DIR/* /Workspace/ - cd /Workspace - snapcraft - ls + - cp -r /Workspace/* $CI_PROJECT_DIR/ artifacts: name: "easy-installer" paths: @@ -74,10 +77,13 @@ build-snap: build-linux-x64: image: $CONTAINER_IMAGE:$CONTAINER_TAG stage: build + variables: + GIT_SUBMODULE_STRATEGY: recursive script: - cp -r $CI_PROJECT_DIR/* /Workspace/ - cd /Workspace - ./gradlew dist + - cp -r /Workspace/* $CI_PROJECT_DIR/ artifacts: name: "easy-installer-$CI_COMMIT_TAG-linux_x64" paths: @@ -88,12 +94,15 @@ build-linux-x64: build-windows: image: $CONTAINER_IMAGE:$CONTAINER_TAG stage: build + variables: + GIT_SUBMODULE_STRATEGY: recursive script: - cp -r $CI_PROJECT_DIR/* /Workspace/ - cd /Workspace - ./gradlew jlink -Pkey="$PEPPER" - makensis windows-installer-mui.nsi - sha256sum Easy-installer-setup.exe > Easy-installer-setup.exe.sha256sum + - cp -r /Workspace/* $CI_PROJECT_DIR/ artifacts: name: "easy-installer-windows" paths: @@ -105,6 +114,8 @@ build-macos: tags: - generic_privileged stage: build + variables: + GIT_SUBMODULE_STRATEGY: recursive script: - cp -r $CI_PROJECT_DIR/* /Workspace/ - cd /Workspace @@ -112,6 +123,7 @@ build-macos: - cd Mac-build - ./mac_package.sh - sha256sum EasyInstaller.dmg > EasyInstaller.dmg.sha256sum + - cp -r /Workspace/* $CI_PROJECT_DIR/ artifacts: name: "easy-installer-mac" paths: -- GitLab From 91970711611d6d1ab24875a200117efb8843310a Mon Sep 17 00:00:00 2001 From: Jackeagle Date: Thu, 30 May 2024 01:46:42 -0400 Subject: [PATCH 6/8] ci: Set Arch specific container tag - Since Arch container is seperate its good to have its own tag variable for better control Signed-off-by: Jackeagle --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b307f1c..2f726881 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,6 +2,7 @@ variables: GIT_SUBMODULE_STRATEGY: recursive CONTAINER_IMAGE: registry.gitlab.e.foundation/e/devices/easy-installer CONTAINER_TAG: beta + ARCH_CONTAINER_TAG: stable stages: - test @@ -131,7 +132,7 @@ build-macos: - Mac-build/EasyInstaller.dmg.sha256sum build-aur: - image: $CONTAINER_IMAGE/aur:$CONTAINER_TAG + image: $CONTAINER_IMAGE/aur:$ARCH_CONTAINER_TAG stage: build before_script: - mkdir dist && cp -a pkg/arch/. dist -- GitLab From b755b119047f2b4c79c1c0a2120769507437f9b0 Mon Sep 17 00:00:00 2001 From: Jackeagle Date: Thu, 30 May 2024 05:50:49 -0400 Subject: [PATCH 7/8] ci: Improve build system - Use gitlab predefined CI_REGISTRY_IMAGE variable instead of CONTAINER_IMAGE - Remove workspace logic since its only useful for local build. Signed-off-by: Jackeagle --- .gitlab-ci.yml | 61 ++++++++++++++++++++------------------------------ Dockerfile | 8 ++----- 2 files changed, 26 insertions(+), 43 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f726881..abef6584 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,5 @@ variables: GIT_SUBMODULE_STRATEGY: recursive - CONTAINER_IMAGE: registry.gitlab.e.foundation/e/devices/easy-installer CONTAINER_TAG: beta ARCH_CONTAINER_TAG: stable @@ -11,12 +10,12 @@ stages: - publish check-version: - image: $CONTAINER_IMAGE:$CONTAINER_TAG + image: $CI_REGISTRY_IMAGE:$CONTAINER_TAG stage: test script: - ./version.sh check rules: - - if: '$CI_COMMIT_TAG' + - if: "$CI_COMMIT_TAG" when: always build-docker: @@ -29,10 +28,10 @@ build-docker: variables: DOCKER_DRIVER: overlay2 script: - - docker pull $CONTAINER_IMAGE:$CONTAINER_TAG || true + - docker pull $CI_REGISTRY_IMAGE:$CONTAINER_TAG || true - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.gitlab.e.foundation - - docker build --cache-from $CONTAINER_IMAGE:$CONTAINER_TAG -t $CONTAINER_IMAGE:$CONTAINER_TAG . - - docker push $CONTAINER_IMAGE:$CONTAINER_TAG + - docker build --cache-from $CI_REGISTRY_IMAGE:$CONTAINER_TAG -t $CI_REGISTRY_IMAGE:$CONTAINER_TAG . + - docker push $CI_REGISTRY_IMAGE:$CONTAINER_TAG rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" changes: @@ -49,10 +48,10 @@ build-aur-docker: variables: DOCKER_DRIVER: overlay2 script: - - docker pull $CONTAINER_IMAGE/aur:$CONTAINER_TAG || true + - docker pull $CI_REGISTRY_IMAGE/aur:$CONTAINER_TAG || true - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY - - cd docker && docker build --cache-from $CONTAINER_IMAGE/aur:$CONTAINER_TAG -f Dockerfile.arch -t $CONTAINER_IMAGE/aur:$CONTAINER_TAG . - - docker push $CONTAINER_IMAGE/aur:$CONTAINER_TAG + - cd docker && docker build --cache-from $CI_REGISTRY_IMAGE/aur:$CONTAINER_TAG -f Dockerfile.arch -t $CI_REGISTRY_IMAGE/aur:$CONTAINER_TAG . + - docker push $CI_REGISTRY_IMAGE/aur:$CONTAINER_TAG rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" changes: @@ -60,31 +59,25 @@ build-aur-docker: when: manual build-snap: - image: $CONTAINER_IMAGE:$CONTAINER_TAG + image: $CI_REGISTRY_IMAGE:$CONTAINER_TAG stage: build variables: GIT_SUBMODULE_STRATEGY: recursive script: - - cp -r $CI_PROJECT_DIR/* /Workspace/ - - cd /Workspace - snapcraft - ls - - cp -r /Workspace/* $CI_PROJECT_DIR/ artifacts: name: "easy-installer" paths: - easy-installer*.snap build-linux-x64: - image: $CONTAINER_IMAGE:$CONTAINER_TAG + image: $CI_REGISTRY_IMAGE:$CONTAINER_TAG stage: build variables: GIT_SUBMODULE_STRATEGY: recursive script: - - cp -r $CI_PROJECT_DIR/* /Workspace/ - - cd /Workspace - ./gradlew dist - - cp -r /Workspace/* $CI_PROJECT_DIR/ artifacts: name: "easy-installer-$CI_COMMIT_TAG-linux_x64" paths: @@ -93,17 +86,14 @@ build-linux-x64: - if: $CI_COMMIT_TAG build-windows: - image: $CONTAINER_IMAGE:$CONTAINER_TAG + image: $CI_REGISTRY_IMAGE:$CONTAINER_TAG stage: build variables: GIT_SUBMODULE_STRATEGY: recursive script: - - cp -r $CI_PROJECT_DIR/* /Workspace/ - - cd /Workspace - ./gradlew jlink -Pkey="$PEPPER" - makensis windows-installer-mui.nsi - sha256sum Easy-installer-setup.exe > Easy-installer-setup.exe.sha256sum - - cp -r /Workspace/* $CI_PROJECT_DIR/ artifacts: name: "easy-installer-windows" paths: @@ -111,20 +101,17 @@ build-windows: - Easy-installer-setup.exe.sha256sum build-macos: - image: $CONTAINER_IMAGE:$CONTAINER_TAG + image: $CI_REGISTRY_IMAGE:$CONTAINER_TAG tags: - generic_privileged stage: build variables: GIT_SUBMODULE_STRATEGY: recursive script: - - cp -r $CI_PROJECT_DIR/* /Workspace/ - - cd /Workspace - ./gradlew jlink - cd Mac-build - ./mac_package.sh - sha256sum EasyInstaller.dmg > EasyInstaller.dmg.sha256sum - - cp -r /Workspace/* $CI_PROJECT_DIR/ artifacts: name: "easy-installer-mac" paths: @@ -132,7 +119,7 @@ build-macos: - Mac-build/EasyInstaller.dmg.sha256sum build-aur: - image: $CONTAINER_IMAGE/aur:$ARCH_CONTAINER_TAG + image: $CI_REGISTRY_IMAGE/aur:$ARCH_CONTAINER_TAG stage: build before_script: - mkdir dist && cp -a pkg/arch/. dist @@ -144,7 +131,7 @@ build-aur: - dist/*.pkg.tar.zst publish-ubuntu: - image: $CONTAINER_IMAGE:$CONTAINER_TAG + image: $CI_REGISTRY_IMAGE:$CONTAINER_TAG stage: publish needs: ["build-snap"] variables: @@ -154,17 +141,17 @@ publish-ubuntu: - snapcraft upload *.snap --release $RELEASE_TYPE - snapcraft logout && rm snapcraft.login rules: - - if: '$CI_COMMIT_TAG' + - if: "$CI_COMMIT_TAG" when: manual publish-macos: - image: $CONTAINER_IMAGE:$CONTAINER_TAG + image: $CI_REGISTRY_IMAGE:$CONTAINER_TAG stage: publish needs: ["build-macos"] variables: RELEASE_TYPE: beta before_script: - - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' + - "which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )" - eval $(ssh-agent -s) - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null - mkdir -p ~/.ssh @@ -175,17 +162,17 @@ publish-macos: - "rsync -avz Mac-build/EasyInstaller.dmg* $PUBLISH_USER@$PUBLISH_URL:$PUBLISH_DEST" - ssh $PUBLISH_USER@$PUBLISH_URL "mv $PUBLISH_DEST/* $RELEASE_DEST/" rules: - - if: '$CI_COMMIT_TAG' + - if: "$CI_COMMIT_TAG" when: manual publish-windows: - image: $CONTAINER_IMAGE:$CONTAINER_TAG + image: $CI_REGISTRY_IMAGE:$CONTAINER_TAG stage: publish needs: ["build-windows"] variables: RELEASE_TYPE: beta before_script: - - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' + - "which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )" - eval $(ssh-agent -s) - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null - mkdir -p ~/.ssh @@ -196,11 +183,11 @@ publish-windows: - "rsync -avz Easy-installer-setup.exe* $PUBLISH_USER@$PUBLISH_URL:$PUBLISH_DEST" - ssh $PUBLISH_USER@$PUBLISH_URL "mv $PUBLISH_DEST/* $RELEASE_DEST/" rules: - - if: '$CI_COMMIT_TAG' + - if: "$CI_COMMIT_TAG" when: manual .publish-aur: - image: $CONTAINER_IMAGE/aur:$CONTAINER_TAG + image: $CI_REGISTRY_IMAGE/aur:$CONTAINER_TAG stage: publish needs: ["build-aur"] variables: @@ -235,7 +222,7 @@ publish-aur: environment: name: aur-repo rules: - - if: '$CI_COMMIT_TAG' + - if: "$CI_COMMIT_TAG" when: manual publish-linux-x64: @@ -247,4 +234,4 @@ publish-linux-x64: script: - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file "${CI_PROJECT_DIR}/build/distributions/easyInstaller-linux-x64.zip" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/easy-installer/$CI_COMMIT_TAG/$PKG_NAME"' rules: - - if: '$CI_COMMIT_TAG' + - if: "$CI_COMMIT_TAG" diff --git a/Dockerfile b/Dockerfile index 26faff61..ffa122c7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,9 +9,8 @@ COPY --from=builder /snap/bin/snapcraft /snap/bin/snapcraft # Install necessary packages RUN apt-get update && apt-get dist-upgrade --yes && \ - apt-get install --yes snapd sudo locales && \ - locale-gen en_US.UTF-8 && \ - apt-get install --yes iputils-ping wget unzip gcc nsis rsync hfsprogs hfsplus + apt-get install --yes snapd sudo locales wget unzip gcc nsis rsync hfsprogs hfsplus && \ + locale-gen en_US.UTF-8 # Set the proper environment ENV LANG="en_US.UTF-8" @@ -37,6 +36,3 @@ RUN mkdir -p /usr/local/gradle && \ # Set Gradle environment variables ENV GRADLE_HOME=/usr/local/gradle/gradle-4.10.2 ENV PATH=$GRADLE_HOME/bin:$PATH - -# Set the working directory to /Workspace -WORKDIR /Workspace -- GitLab From f8278d418df50dca9c1b3fa84dcbcf6491d996c3 Mon Sep 17 00:00:00 2001 From: Jackeagle Date: Thu, 30 May 2024 10:06:08 -0400 Subject: [PATCH 8/8] ci: Switch to stable tag Signed-off-by: Jackeagle --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index abef6584..38aef42f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ variables: GIT_SUBMODULE_STRATEGY: recursive - CONTAINER_TAG: beta + CONTAINER_TAG: stable ARCH_CONTAINER_TAG: stable stages: -- GitLab