diff options
| author | Joseph Donofry <rubberduckie3554@gmail.com> | 2024-02-17 16:03:03 -0500 |
|---|---|---|
| committer | Joseph Donofry <rubberduckie3554@gmail.com> | 2024-02-17 16:03:03 -0500 |
| commit | 4598dbf062c74b3edca8300273649e453ac0a759 (patch) | |
| tree | e64992f78fba46fc8cd76adafed3d257a42a9135 | |
| parent | 8e3814d22da1df0e20e38407b4396c6dde42e916 (diff) | |
Split codesign into two jobs
| -rw-r--r-- | .gitlab-ci.yml | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c44f03ee..83dc2abc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -276,38 +276,47 @@ build-macos-as: - export PATH="$QTPATH:${PATH}" - ./.ci/macos/build.sh -codesign-macos: +.codesign-macos: &codesign_macos stage: sign - tags: [macos] - variables: - PLAT: "intel" before_script: - pip3 install dmgbuild + tags: [macos] script: - export QTPATH=(/Users/jdonof/Qt/6.*/macos/bin) - export PATH=${QTPATH}:${PATH} - ./.ci/macos/notarize.sh after_script: - ./.ci/upload-nightly-gitlab.sh artifacts/nheko-${CI_COMMIT_SHORT_SHA}-${PLAT}.dmg + artifacts: + paths: + - artifacts/nheko-${CI_COMMIT_SHORT_SHA}-${PLAT}.dmg + - /tmp/notarize* + name: nheko-${CI_COMMIT_SHORT_SHA}-macos + +codesign-macos-intel: + <<: *codesign_macos + variables: + PLAT: "intel" needs: - job: build-macos - optional: true # optional since we want to be able to also trigger this job from cirrus ci for apple silicon builds. + rules: + - if : '$CI_COMMIT_BRANCH == "master"' + - if : $CI_COMMIT_TAG + +codesign-macos-as: + <<: *codesign_macos + tags: [macos] + variables: + PLAT: "apple_silicon" + needs: - job: build-macos-as - optional: true + optional: true # optional since we want to be able to also trigger this job from cirrus ci for apple silicon builds. rules: - if : '$CI_PIPELINE_TRIGGERED && $CI_COMMIT_REF_PROTECTED == "true"' variables: PLAT: "apple_silicon" - - if : '$CI_RUNNER_TAGS =~ /^mac-tart/' - variables: - PLAT: "apple_silicon" - if : '$CI_COMMIT_BRANCH == "master"' - if : $CI_COMMIT_TAG - artifacts: - paths: - - artifacts/nheko-${CI_COMMIT_SHORT_SHA}-${PLAT}.dmg - - /tmp/notarize* - name: nheko-${CI_COMMIT_SHORT_SHA}-macos build-flatpak: stage: build @@ -446,7 +455,8 @@ github-release: dependencies: #- appimage-amd64 <- disabled because of missing packages - build-flatpak - - codesign-macos + - codesign-macos-intel + - codesign-macos-as - codesign-windows before_script: - apk update && apk add jq curl perl |