diff --git a/.ci/image/Dockerfile.linux b/.ci/image/Dockerfile.linux index df10059..4927810 100644 --- a/.ci/image/Dockerfile.linux +++ b/.ci/image/Dockerfile.linux @@ -5,7 +5,6 @@ RUN set -eux; \ apt-get install --no-install-recommends -y \ build-essential \ curl \ - git \ gpg \ jq \ libatk1.0-dev \ diff --git a/.ci/pipelines/base-pipeline.yml b/.ci/pipelines/base-pipeline.yml index f231fb7..ae9e323 100644 --- a/.ci/pipelines/base-pipeline.yml +++ b/.ci/pipelines/base-pipeline.yml @@ -40,4 +40,4 @@ jobs: pr: ((.:pr)) gitea_api_key: ((gitea_api_key)) instance_vars: - number: ((.:pr.number)) + n: ((.:pr.number)) diff --git a/.ci/pipelines/pr.yml b/.ci/pipelines/pr.yml index a9060f9..146f987 100644 --- a/.ci/pipelines/pr.yml +++ b/.ci/pipelines/pr.yml @@ -37,6 +37,7 @@ resources: url: http://forgejo:3000 owner: bitsquid_dt repo: dtmt + sha: ((pr.head.sha)) context: lint/clippy description: Checking for common mistakes and opportunities for code improvement @@ -47,6 +48,7 @@ resources: url: http://forgejo:3000 owner: bitsquid_dt repo: dtmt + sha: ((pr.head.sha)) context: build/msvc description: "Build for the target platform: msvc" @@ -57,6 +59,7 @@ resources: url: http://forgejo:3000 owner: bitsquid_dt repo: dtmt + sha: ((pr.head.sha)) context: build/linux description: "Build for the target platform: linux" @@ -69,7 +72,6 @@ jobs: no_get: true params: state: success - sha: ((.:git_sha)) on_failure: put: state-failure @@ -77,21 +79,16 @@ jobs: no_get: true params: state: failure - sha: ((.:git_sha)) plan: - - get: repo - trigger: true - - - load_var: git_sha - file: repo/.git/ref - - put: state-pending resource: pr-status-lint-clippy no_get: true params: state: pending - sha: ((.:git_sha)) + + - get: repo + trigger: true - task: check file: repo/.ci/tasks/clippy.yml @@ -106,7 +103,6 @@ jobs: no_get: true params: state: success - sha: ((.:git_sha)) on_failure: put: state-failure @@ -114,21 +110,16 @@ jobs: no_get: true params: state: failure - sha: ((.:git_sha)) plan: - - get: repo - trigger: true - - - load_var: git_sha - file: repo/.git/ref - - put: state-pending resource: pr-status-build-msvc no_get: true params: state: pending - sha: ((.:git_sha)) + + - get: repo + trigger: true - task: build file: repo/.ci/tasks/build.yml @@ -163,7 +154,6 @@ jobs: no_get: true params: state: success - sha: ((.:git_sha)) on_failure: put: state-failure @@ -171,21 +161,16 @@ jobs: no_get: true params: state: failure - sha: ((.:git_sha)) plan: - - get: repo - trigger: true - - - load_var: git_sha - file: repo/.git/ref - - put: state-pending resource: pr-status-build-linux no_get: true params: state: pending - sha: ((.:git_sha)) + + - get: repo + trigger: true - task: build file: repo/.ci/tasks/build.yml diff --git a/.ci/tasks/build.sh b/.ci/tasks/build.sh index 9d294b8..4c70a10 100755 --- a/.ci/tasks/build.sh +++ b/.ci/tasks/build.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh set -eu @@ -16,7 +16,7 @@ cd "repo" if [ -n "${PR:-}" ]; then 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 ref=$(git describe --tags) fi diff --git a/Justfile b/Justfile index 70af61a..964dc1f 100644 --- a/Justfile +++ b/Justfile @@ -29,7 +29,7 @@ ci-image-linux: docker push registry.sclu1034.dev/dtmt-ci-base-linux set-base-pipeline: - fly -t {{fly_target}} set-pipeline \ + fly -t ((fly_target)) set-pipeline \ --pipeline dtmt-prs \ --config .ci/pipelines/base-pipeline.yml \ -v gitea_api_key=${GITEA_API_KEY} \ @@ -46,7 +46,7 @@ set-pr-pipeline pr: --pipeline dtmt-pr \ --config .ci/pipelines/pr.yml \ -v gitea_api_key=${GITEA_API_KEY} \ - -i number={{pr}} \ + -i n={{pr}} \ -y branch="$(yq -y '.head.ref' 'pr-{{pr}}.yaml')" \ -y pr="$(cat 'pr-{{pr}}.yaml')"