From b1d0dce08ad56cd6c10a2acd6e37abea6d9a9384 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Fri, 18 Feb 2022 14:28:58 +0100 Subject: [PATCH] added .en-US. to macos artifacts --- .gitlab-ci.yml | 16 ++++++++-------- assets/macos.mk | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1ce180c..c56a91b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,10 +79,10 @@ Release: upload_package librewolf-$VERSION-$RELEASE.fc34.x86_64.rpm.sha256sum upload_package librewolf-$VERSION-$RELEASE.fc35.x86_64.rpm upload_package librewolf-$VERSION-$RELEASE.fc35.x86_64.rpm.sha256sum - upload_package librewolf-$VERSION-$RELEASE.mac.x86_64.dmg - upload_package librewolf-$VERSION-$RELEASE.mac.x86_64.dmg.sha256sum - upload_package librewolf-$VERSION-$RELEASE.mac.aarch64.dmg - upload_package librewolf-$VERSION-$RELEASE.mac.aarch64.dmg.sha256sum + upload_package librewolf-$VERSION-$RELEASE.en-US.mac.x86_64.dmg + upload_package librewolf-$VERSION-$RELEASE.en-US.mac.x86_64.dmg.sha256sum + upload_package librewolf-$VERSION-$RELEASE.en-US.mac.aarch64.dmg + upload_package librewolf-$VERSION-$RELEASE.en-US.mac.aarch64.dmg.sha256sum release: tag_name: "$VERSION-$RELEASE" description: "## LibreWolf bsys5 Release v$VERSION-$RELEASE\n\n- \n\n(Built on GitLab by pipeline [$CI_PIPELINE_ID](https://gitlab.com/librewolf-community/browser/bsys5/-/pipelines/$CI_PIPELINE_ID))" @@ -126,16 +126,16 @@ Release: url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.fc35.x86_64.rpm.sha256sum - name: macOS x86_64 (dmg) link_type: package - url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.mac.x86_64.dmg + url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.en-US.mac.x86_64.dmg - name: macOS x86_64 (sha256sum) link_type: other - url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.mac.x86_64.dmg.sha256sum + url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.en-US.mac.x86_64.dmg.sha256sum - name: macOS aarch64 (dmg) link_type: package - url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.mac.aarch64.dmg + url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.en-US.mac.aarch64.dmg - name: macOS aarch64 (sha256sum) link_type: other - url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.mac.aarch64.dmg.sha256sum + url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.en-US.mac.aarch64.dmg.sha256sum Update Repositories: stage: deploy diff --git a/assets/macos.mk b/assets/macos.mk index b6443f0..ea6858e 100644 --- a/assets/macos.mk +++ b/assets/macos.mk @@ -12,7 +12,7 @@ ifeq ($(use_docker),) use_docker:=true endif -outfile=librewolf-$(version)-$(release).mac.$(arch).dmg +outfile=librewolf-$(version)-$(release).en-US.mac.$(arch).dmg docker : docker build --build-arg "arch=$(arch)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t librewolf/bsys5-image-macos-$(arch) - < assets/macos.Dockerfile