Page MenuHomePhorge
Files F13551745

D252.1765140600.diff
No OneTemporary
Actions

Size
6 KB
Referenced Files
None
Subscribers
None

D252.1765140600.diff
View Options

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,39 +2,11 @@
# SPDX-FileCopyrightText: 2022-2023 tusooa <tusooa@kazv.moe>
# SPDX-License-Identifier: AGPL-3.0-or-later
-workflow:
- rules:
- - if: '$CI_PIPELINE_SOURCE == "trigger"'
- - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
- when: never
- - if: $CI_COMMIT_BRANCH
- - if: '$CI_COMMIT_TAG !~ /^phabricator\//'
-
stages:
- - prepare
- lint
- build
- - coverage-vis
- - coverage-upload
- doc
- pages
- - report
-
-.report:
- image:
- name: 'reg.lily.kazv.moe/infra/phorge-ci-tools:servant'
- rules:
- - if: $TARGET_PHID
- when: always
- - when: never
- before_script:
- - pipelineUrl="$CI_PROJECT_URL"/-/pipelines/"$CI_PIPELINE_ID"
-
-report-start:
- extends: .report
- stage: prepare
- script:
- - 'echo "{\"receiver\": \"$TARGET_PHID\", \"type\": \"work\", \"unit\": [{\"name\": \"GitLab CI (information only)\", \"result\": \"skip\", \"details\": \"$pipelineUrl\", \"format\": \"remarkup\"}]}" | /tools/arcanist/bin/arc call-conduit --conduit-uri https://iron.lily-is.land/ --conduit-token "$CONDUIT_TOKEN" -- harbormaster.sendmessage'
lint:
stage: lint
@@ -62,10 +34,11 @@
- export TMPDIR="$CI_PROJECT_DIR"/cache
- mkdir -pv "$TMPDIR"
- chown -R podman:podman "$TMPDIR"
- - sudo -u podman TMPDIR="$TMPDIR" podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
+ - sudo -u podman TMPDIR="$TMPDIR" podman login -u "$REGISTRY_USER" -p "$REGISTRY_PASSWORD" "$REGISTRY"
- sudo -u podman TMPDIR="$TMPDIR" podman build -f "$CI_PROJECT_DIR"/Containerfile --build-arg JOBS=1 --build-arg BASE_IMG_TAG=$BASE_IMG_TAG --build-arg BUILD_TYPE=$BUILD_TYPE $BUILD_ARGS -t "$CANONICAL_TAG" "$CI_PROJECT_DIR"
+ # Only branch and tag commits should trigger pushing
- |
- if [ "$CI_PIPELINE_SOURCE" == "trigger" ]; then
+ if [ -z "$CI_COMMIT_BRANCH" -a -z "$CI_COMMIT_TAG" ]; then
echo 'Skipping pushing'
else
sudo -u podman TMPDIR="$TMPDIR" podman push "$CANONICAL_TAG"
@@ -83,26 +56,30 @@
paths:
- cache/buildah-cache-1000/
-'build:debug:22.04':
+'build:debug:24.04':
extends: .build
before_script:
- - BASE_IMG_TAG=servant-ubuntu22.04
+ - BASE_IMG_TAG=servant-ubuntu24.04
- BUILD_TYPE=Debug
- - CANONICAL_TAG="$CI_REGISTRY_IMAGE/libkazv:$CI_COMMIT_REF_SLUG-ubuntu22.04-debug"
- - ADDITIONAL_TAGS="$CI_REGISTRY_IMAGE/libkazv:$CI_COMMIT_REF_SLUG $CI_REGISTRY_IMAGE/libkazv:$CI_COMMIT_REF_SLUG-debug $CI_REGISTRY_IMAGE/libkazv:$CI_COMMIT_REF_SLUG-ubuntu22.04"
+ - REGISTRY_IMAGE=$REGISTRY/the-kazv-project/libkazv
+ - BASE_TAG="$REGISTRY_IMAGE:${CI_COMMIT_REF_SLUG-none}"
+ - CANONICAL_TAG="$BASE_TAG-ubuntu24.04-debug"
+ - ADDITIONAL_TAGS="$BASE_TAG $BASE_TAG-debug $BASE_TAG-ubuntu24.04"
-'build:production:22.04':
+'build:production:24.04':
extends: .build
before_script:
- - BASE_IMG_TAG=servant-ubuntu22.04
+ - BASE_IMG_TAG=servant-ubuntu24.04
- BUILD_TYPE=Release
- - CANONICAL_TAG="$CI_REGISTRY_IMAGE/libkazv:$CI_COMMIT_REF_SLUG-ubuntu22.04-prod"
- - ADDITIONAL_TAGS="$CI_REGISTRY_IMAGE/libkazv:$CI_COMMIT_REF_SLUG-prod"
+ - REGISTRY_IMAGE=$REGISTRY/the-kazv-project/libkazv
+ - BASE_TAG="$REGISTRY_IMAGE:${CI_COMMIT_REF_SLUG-none}"
+ - CANONICAL_TAG="$BASE_TAG-ubuntu24.04-prod"
+ - ADDITIONAL_TAGS="$BASE_TAG-prod"
'build:coverage':
stage: build
image:
- name: reg.lily.kazv.moe/kazv/libkazv-deps/deps:servant-ubuntu22.04
+ name: r.lily-is.land/the-kazv-project/libkazv-deps:servant-ubuntu24.04
entrypoint: [""]
# Do not set CCACHE_BASEDIR when building for coverage
# https://gitlab.kitware.com/cmake/cmake/-/issues/21138
@@ -143,32 +120,6 @@
paths:
- ccache/
-'coverage-report':
- rules: *build-rules
- stage: coverage-vis
- image: 'reg.lily.kazv.moe/infra/phorge-ci-tools/pycobertura:servant'
- script:
- - pycobertura show ./build/coverage.xml --format html --output ./build/coverage.html --source .
- - pycobertura show ./build/coverage.xml --format markdown --source . | python -c 'import sys, json; print(json.dumps("".join(sys.stdin)))' > ./build/coverage-md.json
- - /tools/cobertura-to-phorge ./build/coverage.xml . > ./build/coverage.json
- artifacts:
- name: ${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHA}
- paths:
- - build/coverage.html
- - build/coverage-md.json
- - build/coverage.json
-
-upload-coverage:
- extends: .report
- stage: coverage-upload
- rules:
- - if: $TARGET_PHID
- changes: *src-chg
- when: always
- - when: never
- script:
- - '{ echo "{\"receiver\": \"$TARGET_PHID\", \"type\": \"work\", \"unit\": [{\"name\": \"Test coverage\", \"result\": \"pass\", \"details\": "; cat build/coverage-md.json; echo ", \"format\": \"remarkup\", \"coverage\":"; cat build/coverage.json; echo "}]}"; } | /tools/arcanist/bin/arc call-conduit --conduit-uri https://iron.lily-is.land/ --conduit-token "$CONDUIT_TOKEN" -- harbormaster.sendmessage'
-
'doc:build':
stage: doc
image: reg.lily.kazv.moe/kazv/libkazv-deps/deps:servant
@@ -200,23 +151,3 @@
when: never
- changes: *src-chg
- changes: *doc-chg
-
-report-success:
- extends: .report
- rules:
- - if: $TARGET_PHID
- when: on_success
- - when: never
- stage: report
- script:
- - 'echo "{\"receiver\": \"$TARGET_PHID\", \"type\": \"pass\"}" | /tools/arcanist/bin/arc call-conduit --conduit-uri https://iron.lily-is.land/ --conduit-token "$CONDUIT_TOKEN" -- harbormaster.sendmessage'
-
-report-failure:
- extends: .report
- rules:
- - if: $TARGET_PHID
- when: on_failure
- - when: never
- stage: report
- script:
- - 'echo "{\"receiver\": \"$TARGET_PHID\", \"type\": \"fail\"}" | /tools/arcanist/bin/arc call-conduit --conduit-uri https://iron.lily-is.land/ --conduit-token "$CONDUIT_TOKEN" -- harbormaster.sendmessage'
diff --git a/Containerfile b/Containerfile
--- a/Containerfile
+++ b/Containerfile
@@ -1,5 +1,5 @@
ARG BASE_IMG_TAG=servant
-FROM reg.lily.kazv.moe/kazv/libkazv-deps/deps:$BASE_IMG_TAG
+FROM r.lily-is.land/the-kazv-project/libkazv-deps:$BASE_IMG_TAG
RUN mkdir -pv /build
COPY . /build/libkazv

File Metadata

Mime Type
text/plain
Expires
Sun, Dec 7, 12:50 PM (15 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
701197
Default Alt Text
D252.1765140600.diff (6 KB)

Event Timeline