Compare commits

..

2 commits

Author SHA1 Message Date
92546f6f5e
Fix pipeline status
All checks were successful
lint/clippy Checking for common mistakes and opportunities for code improvement
build/msvc Build for the target platform: msvc
build/linux Build for the target platform: linux
Since the PR pipeline is not re-applied on new commits, the `pr.head.ref`
variable doesn't get updated, and isn't suitable for the status
reporting.
2023-11-23 15:23:40 +01:00
b86ea337d1
Fix build script 2023-11-23 15:23:02 +01:00
5 changed files with 33 additions and 17 deletions

View file

@ -5,6 +5,7 @@ RUN set -eux; \
apt-get install --no-install-recommends -y \ apt-get install --no-install-recommends -y \
build-essential \ build-essential \
curl \ curl \
git \
gpg \ gpg \
jq \ jq \
libatk1.0-dev \ libatk1.0-dev \

View file

@ -40,4 +40,4 @@ jobs:
pr: ((.:pr)) pr: ((.:pr))
gitea_api_key: ((gitea_api_key)) gitea_api_key: ((gitea_api_key))
instance_vars: instance_vars:
n: ((.:pr.number)) number: ((.:pr.number))

View file

@ -37,7 +37,6 @@ resources:
url: http://forgejo:3000 url: http://forgejo:3000
owner: bitsquid_dt owner: bitsquid_dt
repo: dtmt repo: dtmt
sha: ((pr.head.sha))
context: lint/clippy context: lint/clippy
description: Checking for common mistakes and opportunities for code improvement description: Checking for common mistakes and opportunities for code improvement
@ -48,7 +47,6 @@ resources:
url: http://forgejo:3000 url: http://forgejo:3000
owner: bitsquid_dt owner: bitsquid_dt
repo: dtmt repo: dtmt
sha: ((pr.head.sha))
context: build/msvc context: build/msvc
description: "Build for the target platform: msvc" description: "Build for the target platform: msvc"
@ -59,7 +57,6 @@ resources:
url: http://forgejo:3000 url: http://forgejo:3000
owner: bitsquid_dt owner: bitsquid_dt
repo: dtmt repo: dtmt
sha: ((pr.head.sha))
context: build/linux context: build/linux
description: "Build for the target platform: linux" description: "Build for the target platform: linux"
@ -72,6 +69,7 @@ jobs:
no_get: true no_get: true
params: params:
state: success state: success
sha: ((.:git_sha))
on_failure: on_failure:
put: state-failure put: state-failure
@ -79,16 +77,21 @@ jobs:
no_get: true no_get: true
params: params:
state: failure state: failure
sha: ((.:git_sha))
plan: plan:
- get: repo
trigger: true
- load_var: git_sha
file: repo/.git/ref
- put: state-pending - put: state-pending
resource: pr-status-lint-clippy resource: pr-status-lint-clippy
no_get: true no_get: true
params: params:
state: pending state: pending
sha: ((.:git_sha))
- get: repo
trigger: true
- task: check - task: check
file: repo/.ci/tasks/clippy.yml file: repo/.ci/tasks/clippy.yml
@ -103,6 +106,7 @@ jobs:
no_get: true no_get: true
params: params:
state: success state: success
sha: ((.:git_sha))
on_failure: on_failure:
put: state-failure put: state-failure
@ -110,16 +114,21 @@ jobs:
no_get: true no_get: true
params: params:
state: failure state: failure
sha: ((.:git_sha))
plan: plan:
- get: repo
trigger: true
- load_var: git_sha
file: repo/.git/ref
- put: state-pending - put: state-pending
resource: pr-status-build-msvc resource: pr-status-build-msvc
no_get: true no_get: true
params: params:
state: pending state: pending
sha: ((.:git_sha))
- get: repo
trigger: true
- task: build - task: build
file: repo/.ci/tasks/build.yml file: repo/.ci/tasks/build.yml
@ -154,6 +163,7 @@ jobs:
no_get: true no_get: true
params: params:
state: success state: success
sha: ((.:git_sha))
on_failure: on_failure:
put: state-failure put: state-failure
@ -161,16 +171,21 @@ jobs:
no_get: true no_get: true
params: params:
state: failure state: failure
sha: ((.:git_sha))
plan: plan:
- get: repo
trigger: true
- load_var: git_sha
file: repo/.git/ref
- put: state-pending - put: state-pending
resource: pr-status-build-linux resource: pr-status-build-linux
no_get: true no_get: true
params: params:
state: pending state: pending
sha: ((.:git_sha))
- get: repo
trigger: true
- task: build - task: build
file: repo/.ci/tasks/build.yml file: repo/.ci/tasks/build.yml

View file

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
set -eu set -eu
@ -16,7 +16,7 @@ cd "repo"
if [ -n "${PR:-}" ]; then if [ -n "${PR:-}" ]; then
title "PR: $(echo "$PR" | jq '.number') - $(echo "$PR" | jq '.title')" title "PR: $(echo "$PR" | jq '.number') - $(echo "$PR" | jq '.title')"
ref="pr-$(echo "$PR" | jq '.number')-$(git rev-parse --short $(cat .git/ref || echo "HEAD")) 2>/dev/null || echo 'manual')" ref="pr-$(echo "$PR" | jq '.number')-$(git rev-parse --short "$(cat .git/ref || echo "HEAD")" 2>/dev/null || echo 'manual')"
else else
ref=$(git describe --tags) ref=$(git describe --tags)
fi fi

View file

@ -29,7 +29,7 @@ ci-image-linux:
docker push registry.sclu1034.dev/dtmt-ci-base-linux docker push registry.sclu1034.dev/dtmt-ci-base-linux
set-base-pipeline: set-base-pipeline:
fly -t ((fly_target)) set-pipeline \ fly -t {{fly_target}} set-pipeline \
--pipeline dtmt-prs \ --pipeline dtmt-prs \
--config .ci/pipelines/base-pipeline.yml \ --config .ci/pipelines/base-pipeline.yml \
-v gitea_api_key=${GITEA_API_KEY} \ -v gitea_api_key=${GITEA_API_KEY} \
@ -46,7 +46,7 @@ set-pr-pipeline pr:
--pipeline dtmt-pr \ --pipeline dtmt-pr \
--config .ci/pipelines/pr.yml \ --config .ci/pipelines/pr.yml \
-v gitea_api_key=${GITEA_API_KEY} \ -v gitea_api_key=${GITEA_API_KEY} \
-i n={{pr}} \ -i number={{pr}} \
-y branch="$(yq -y '.head.ref' 'pr-{{pr}}.yaml')" \ -y branch="$(yq -y '.head.ref' 'pr-{{pr}}.yaml')" \
-y pr="$(cat 'pr-{{pr}}.yaml')" -y pr="$(cat 'pr-{{pr}}.yaml')"