Compare commits

...

5 commits

Author SHA1 Message Date
7f3972a1ae
chore(deps): update rust crate clap to v4.5.37
Some checks are pending
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
2025-04-21 13:31:12 +00:00
c6f9e2a369
Merge pull request 'Fix incorrect URLs' (#220) from feature/ci into master
Some checks are pending
build/linux Build for the target platform: linux
build/msvc Build for the target platform: msvc
Reviewed-on: #220
2025-04-21 15:29:00 +02:00
5aa8421f7d
Fix incorrect URLs 2025-04-21 15:28:27 +02:00
df79c59dc2
Merge pull request 'Remove internal URLs from CI' (#219) from feature/ci into master
Reviewed-on: #219
2025-04-21 15:21:44 +02:00
e61a252ee6
Remove internal URLs from CI
Due to using internal URLs, the pipelines demanded a very specific
network setup to work.
By changing everything to their public-facing URLs, they now become
agnostic to internal topology.
2025-04-21 15:18:19 +02:00
4 changed files with 50 additions and 30 deletions

View file

@ -6,24 +6,30 @@ resource_types:
- name: gitea-package - name: gitea-package
type: registry-image type: registry-image
source: source:
repository: registry.local:5000/gitea-package repository: registry.sclu1034.dev/gitea-package
username: ((registry_user))
password: ((registry_password))
- name: gitea-status - name: gitea-status
type: registry-image type: registry-image
source: source:
repository: registry.local:5000/gitea-status repository: registry.sclu1034.dev/gitea-status
username: ((registry_user))
password: ((registry_password))
- name: gitea-pr - name: gitea-pr
type: registry-image type: registry-image
source: source:
repository: registry.local:5000/gitea-pr repository: registry.sclu1034.dev/gitea-pr
username: ((registry_user))
password: ((registry_password))
resources: resources:
- name: repo - name: repo
type: git type: git
source: source:
uri: http://forgejo:3000/bitsquid_dt/dtmt uri: https://git.sclu1034.dev/bitsquid_dt/dtmt
branch: master branch: master
- name: repo-pr - name: repo-pr
@ -38,7 +44,7 @@ resources:
type: gitea-package type: gitea-package
source: source:
access_token: ((gitea_api_key)) access_token: ((gitea_api_key))
url: http://forgejo:3000 url: https://git.sclu1034.dev
owner: bitsquid_dt owner: bitsquid_dt
type: generic type: generic
name: dtmt name: dtmt
@ -48,7 +54,7 @@ resources:
type: gitea-status type: gitea-status
source: source:
access_token: ((gitea_api_key)) access_token: ((gitea_api_key))
url: http://forgejo:3000 url: https://git.sclu1034.dev
owner: bitsquid_dt owner: bitsquid_dt
repo: dtmt repo: dtmt
context: build/msvc context: build/msvc
@ -58,7 +64,7 @@ resources:
type: gitea-status type: gitea-status
source: source:
access_token: ((gitea_api_key)) access_token: ((gitea_api_key))
url: http://forgejo:3000 url: https://git.sclu1034.dev
owner: bitsquid_dt owner: bitsquid_dt
repo: dtmt repo: dtmt
context: build/linux context: build/linux
@ -85,6 +91,8 @@ jobs:
vars: vars:
pr: ((.:pr)) pr: ((.:pr))
gitea_api_key: ((gitea_api_key)) gitea_api_key: ((gitea_api_key))
registry_user: ((registry_user))
registry_password: ((registry_password))
instance_vars: instance_vars:
number: ((.:pr.number)) number: ((.:pr.number))
@ -192,7 +200,7 @@ jobs:
vars: vars:
pr: "" pr: ""
target: linux target: linux
gitea_url: http://forgejo:3000 gitea_url: https://git.sclu1034.dev
gitea_api_key: ((gitea_api_key)) gitea_api_key: ((gitea_api_key))
- load_var: version_number - load_var: version_number

View file

@ -6,26 +6,30 @@ resource_types:
- name: gitea-package - name: gitea-package
type: registry-image type: registry-image
source: source:
repository: registry.local:5000/gitea-package repository: registry.sclu1034.dev/gitea-package
username: ((registry_user))
password: ((registry_password))
- name: gitea-status - name: gitea-status
type: registry-image type: registry-image
source: source:
repository: registry.local:5000/gitea-status repository: registry.sclu1034.dev/gitea-status
username: ((registry_user))
password: ((registry_password))
resources: resources:
- name: repo - name: repo
type: git type: git
source: source:
uri: http://forgejo:3000/bitsquid_dt/dtmt uri: https://git.sclu1034.dev/bitsquid_dt/dtmt
branch: ((pr.head.ref)) branch: ((pr.head.ref))
- name: gitea-package - name: gitea-package
type: gitea-package type: gitea-package
source: source:
access_token: ((gitea_api_key)) access_token: ((gitea_api_key))
url: http://forgejo:3000 url: https://git.sclu1034.dev
owner: bitsquid_dt owner: bitsquid_dt
type: generic type: generic
name: dtmt name: dtmt
@ -34,7 +38,7 @@ resources:
type: gitea-status type: gitea-status
source: source:
access_token: ((gitea_api_key)) access_token: ((gitea_api_key))
url: http://forgejo:3000 url: https://git.sclu1034.dev
owner: bitsquid_dt owner: bitsquid_dt
repo: dtmt repo: dtmt
context: lint/clippy context: lint/clippy
@ -44,7 +48,7 @@ resources:
type: gitea-status type: gitea-status
source: source:
access_token: ((gitea_api_key)) access_token: ((gitea_api_key))
url: http://forgejo:3000 url: https://git.sclu1034.dev
owner: bitsquid_dt owner: bitsquid_dt
repo: dtmt repo: dtmt
context: build/msvc context: build/msvc
@ -54,7 +58,7 @@ resources:
type: gitea-status type: gitea-status
source: source:
access_token: ((gitea_api_key)) access_token: ((gitea_api_key))
url: http://forgejo:3000 url: https://git.sclu1034.dev
owner: bitsquid_dt owner: bitsquid_dt
repo: dtmt repo: dtmt
context: build/linux context: build/linux
@ -135,7 +139,7 @@ jobs:
vars: vars:
target: msvc target: msvc
pr: ((pr)) pr: ((pr))
gitea_url: http://forgejo:3000 gitea_url: https://git.sclu1034.dev
gitea_api_key: ((gitea_api_key)) gitea_api_key: ((gitea_api_key))
- load_var: version_number - load_var: version_number
@ -193,7 +197,7 @@ jobs:
vars: vars:
target: linux target: linux
pr: ((pr)) pr: ((pr))
gitea_url: http://forgejo:3000 gitea_url: https://git.sclu1034.dev
gitea_api_key: ((gitea_api_key)) gitea_api_key: ((gitea_api_key))
- load_var: version_number - load_var: version_number

30
Cargo.lock generated
View file

@ -417,9 +417,9 @@ dependencies = [
[[package]] [[package]]
name = "clap" name = "clap"
version = "4.5.16" version = "4.5.37"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071"
dependencies = [ dependencies = [
"clap_builder", "clap_builder",
"clap_derive", "clap_derive",
@ -427,23 +427,23 @@ dependencies = [
[[package]] [[package]]
name = "clap_builder" name = "clap_builder"
version = "4.5.15" version = "4.5.37"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2"
dependencies = [ dependencies = [
"anstream", "anstream",
"anstyle", "anstyle",
"clap_lex", "clap_lex",
"strsim", "strsim",
"unicase", "unicase",
"unicode-width", "unicode-width 0.2.0",
] ]
[[package]] [[package]]
name = "clap_derive" name = "clap_derive"
version = "4.5.13" version = "4.5.32"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7"
dependencies = [ dependencies = [
"heck 0.5.0", "heck 0.5.0",
"proc-macro2", "proc-macro2",
@ -453,9 +453,9 @@ dependencies = [
[[package]] [[package]]
name = "clap_lex" name = "clap_lex"
version = "0.7.2" version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
[[package]] [[package]]
name = "cli-table" name = "cli-table"
@ -465,7 +465,7 @@ checksum = "b53f9241f288a7b12c56565f04aaeaeeab6b8923d42d99255d4ca428b4d97f89"
dependencies = [ dependencies = [
"cli-table-derive", "cli-table-derive",
"termcolor", "termcolor",
"unicode-width", "unicode-width 0.1.13",
] ]
[[package]] [[package]]
@ -2022,7 +2022,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"windows-targets 0.52.6", "windows-targets 0.48.5",
] ]
[[package]] [[package]]
@ -3101,7 +3101,7 @@ dependencies = [
"scopeguard", "scopeguard",
"smallvec", "smallvec",
"unicode-segmentation", "unicode-segmentation",
"unicode-width", "unicode-width 0.1.13",
"utf8parse", "utf8parse",
"winapi", "winapi",
] ]
@ -4082,6 +4082,12 @@ version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
[[package]]
name = "unicode-width"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
[[package]] [[package]]
name = "untrusted" name = "untrusted"
version = "0.9.0" version = "0.9.0"

View file

@ -40,6 +40,8 @@ set-base-pipeline:
--pipeline dtmt \ --pipeline dtmt \
--config .ci/pipelines/base.yml \ --config .ci/pipelines/base.yml \
-v gitea_api_key=${GITEA_API_KEY} \ -v gitea_api_key=${GITEA_API_KEY} \
-v registry_user=${REGISTRY_USER} \
-v registry_password=${REGISTRY_PASSWORD} \
-v owner=bitsquid_dt \ -v owner=bitsquid_dt \
-v repo=dtmt -v repo=dtmt
@ -48,7 +50,7 @@ set-pr-pipeline pr:
-H "Authorization: ${GITEA_API_KEY}" \ -H "Authorization: ${GITEA_API_KEY}" \
-H 'Accept: application/json' \ -H 'Accept: application/json' \
'https://git.sclu1034.dev/api/v1/repos/bitsquid_dt/dtmt/pulls/{{pr}}' \ 'https://git.sclu1034.dev/api/v1/repos/bitsquid_dt/dtmt/pulls/{{pr}}' \
| yq -y '.' - > 'pr-{{pr}}.yaml' | yq -y '.' - > 'pr-{{pr}}.yaml'
fly -t main set-pipeline \ fly -t main set-pipeline \
--pipeline dtmt-pr \ --pipeline dtmt-pr \
--config .ci/pipelines/pr.yml \ --config .ci/pipelines/pr.yml \