Put releasable artifacts into artifacts dir

This commit is contained in:
Joseph Donofry 2023-02-28 13:39:11 -05:00
parent 51c9245c6a
commit 9a1a065c61
No known key found for this signature in database
GPG key ID: E8A1D78EF044B0CB
2 changed files with 11 additions and 5 deletions

View file

@ -98,6 +98,6 @@ VERSION=${CI_COMMIT_SHORT_SHA}
if [ -n "$VERSION" ]; then if [ -n "$VERSION" ]; then
mv nheko.dmg "nheko-${VERSION}_${PLAT}.dmg" mv nheko.dmg "nheko-${VERSION}_${PLAT}.dmg"
mkdir artifacts mkdir -p artifacts
cp "nheko-${VERSION}_${PLAT}.dmg" artifacts/ cp "nheko-${VERSION}_${PLAT}.dmg" artifacts/
fi fi

View file

@ -130,7 +130,7 @@ build-macos:
- if : '$CI_PIPELINE_TRIGGERED == null' - if : '$CI_PIPELINE_TRIGGERED == null'
artifacts: artifacts:
paths: paths:
- build/nheko.app - build/nheko.app # not putting this in 'artifacts' subdir because we don't want to put it on releases
name: nheko-${CI_COMMIT_SHORT_SHA}-macos-app name: nheko-${CI_COMMIT_SHORT_SHA}-macos-app
expose_as: 'macos-app' expose_as: 'macos-app'
public: false public: false
@ -186,6 +186,7 @@ build-flatpak-amd64:
after_script: after_script:
- bash ./.ci/upload-nightly-gitlab.sh build-flatpak/nheko-amd64.flatpak - bash ./.ci/upload-nightly-gitlab.sh build-flatpak/nheko-amd64.flatpak
- (cd ./scripts && ./upload-to-flatpak-repo.sh ../build-flatpak/repo) || true - (cd ./scripts && ./upload-to-flatpak-repo.sh ../build-flatpak/repo) || true
- (cd $CI_BUILDS_DIR && mkdir -p artifacts && cp build-flatpak/nheko-arm64.flatpak artifacts/) || true
rules: rules:
- if : '$CI_PIPELINE_TRIGGERED == null' - if : '$CI_PIPELINE_TRIGGERED == null'
cache: cache:
@ -194,7 +195,7 @@ build-flatpak-amd64:
- build-flatpak/.flatpak-builder/ - build-flatpak/.flatpak-builder/
artifacts: artifacts:
expose_as: 'flatpak-amd64' expose_as: 'flatpak-amd64'
paths: ['build-flatpak/nheko-amd64.flatpak'] paths: ['artifacts/nheko-amd64.flatpak']
name: flatpak-${CI_COMMIT_REF_NAME}-${VERSION}-amd64 name: flatpak-${CI_COMMIT_REF_NAME}-${VERSION}-amd64
build-flatpak-arm64: build-flatpak-arm64:
@ -217,6 +218,7 @@ build-flatpak-arm64:
after_script: after_script:
- bash ./.ci/upload-nightly-gitlab.sh build-flatpak/nheko-arm64.flatpak - bash ./.ci/upload-nightly-gitlab.sh build-flatpak/nheko-arm64.flatpak
- (cd ./scripts && ./upload-to-flatpak-repo.sh ../build-flatpak/repo) || true - (cd ./scripts && ./upload-to-flatpak-repo.sh ../build-flatpak/repo) || true
- (cd $CI_BUILDS_DIR && mkdir -p artifacts && cp build-flatpak/nheko-arm64.flatpak artifacts/) || true
rules: rules:
- if : '$CI_PIPELINE_TRIGGERED == "123456"' - if : '$CI_PIPELINE_TRIGGERED == "123456"'
cache: cache:
@ -225,7 +227,7 @@ build-flatpak-arm64:
- build-flatpak/.flatpak-builder/ - build-flatpak/.flatpak-builder/
artifacts: artifacts:
expose_as: 'flatpak-arm64' expose_as: 'flatpak-arm64'
paths: ['build-flatpak/nheko-arm64.flatpak'] paths: ['artifacts/nheko-arm64.flatpak']
name: flatpak-${CI_COMMIT_REF_NAME}-${VERSION}-arm64 name: flatpak-${CI_COMMIT_REF_NAME}-${VERSION}-arm64
appimage-amd64: appimage-amd64:
@ -279,12 +281,13 @@ appimage-amd64:
- mkdir -p AppDir/usr/lib/x86_64-linux-gnu AppDir/lib/x86_64-linux-gnu - mkdir -p AppDir/usr/lib/x86_64-linux-gnu AppDir/lib/x86_64-linux-gnu
- appimage-builder --skip-test - appimage-builder --skip-test
after_script: after_script:
- mkdir -p artifacts && cp nheko-latest-x86_64.AppImage artifacts/
- bash ./.ci/upload-nightly-gitlab.sh nheko-latest-x86_64.AppImage - bash ./.ci/upload-nightly-gitlab.sh nheko-latest-x86_64.AppImage
rules: rules:
- if : '$CI_PIPELINE_TRIGGERED == null' - if : '$CI_PIPELINE_TRIGGERED == null'
artifacts: artifacts:
paths: paths:
- 'nheko-latest-x86_64.AppImage' - 'artifacts/nheko-latest-x86_64.AppImage'
expire_in: 1 week expire_in: 1 week
expose_as: 'appimage-amd64' expose_as: 'appimage-amd64'
cache: cache:
@ -314,6 +317,9 @@ github-release:
tags: [docker] tags: [docker]
rules: rules:
- if: '$CI_COMMIT_TAG =~ /^test\d+\.\d+\.\d+$/' - if: '$CI_COMMIT_TAG =~ /^test\d+\.\d+\.\d+$/'
dependencies:
- build
- sign
before_script: before_script:
- apk update && apk add jq curl perl - apk update && apk add jq curl perl
script: script: