Compare commits

...

5 commits

Author SHA1 Message Date
25d72555f4
chore(deps): update rust crate bincode to v2
Some checks failed
build/msvc Build for the target platform: msvc
lint/clippy Checking for common mistakes and opportunities for code improvement
build/linux Build for the target platform: linux
2025-04-21 13:31:44 +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
5 changed files with 58 additions and 21 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

27
Cargo.lock generated
View file

@ -209,11 +209,22 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
[[package]] [[package]]
name = "bincode" name = "bincode"
version = "1.3.3" version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" checksum = "36eaf5d7b090263e8150820482d5d93cd964a81e4019913c972f4edcc6edb740"
dependencies = [ dependencies = [
"bincode_derive",
"serde", "serde",
"unty",
]
[[package]]
name = "bincode_derive"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf95709a440f45e986983918d0e8a1f30a9b1df04918fc828670606804ac3c09"
dependencies = [
"virtue",
] ]
[[package]] [[package]]
@ -4088,6 +4099,12 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
[[package]]
name = "unty"
version = "0.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae"
[[package]] [[package]]
name = "url" name = "url"
version = "2.5.2" version = "2.5.2"
@ -4162,6 +4179,12 @@ version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
[[package]]
name = "virtue"
version = "0.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "051eb1abcf10076295e815102942cc58f9d5e3b4560e46e53c21e8ff6f3af7b1"
[[package]] [[package]]
name = "vte" name = "vte"
version = "0.11.1" version = "0.11.1"

View file

@ -16,7 +16,7 @@ exclude = ["lib/color-eyre"]
ansi-parser = "0.9.1" ansi-parser = "0.9.1"
ansi_term = "0.12.1" ansi_term = "0.12.1"
async-recursion = "1.0.5" async-recursion = "1.0.5"
bincode = "1.3.3" bincode = "2.0.0"
bitflags = "2.5.0" bitflags = "2.5.0"
byteorder = "1.4.3" byteorder = "1.4.3"
clap = { version = "4.0.15", features = ["color", "derive", "std", "cargo", "string", "unicode"] } clap = { version = "4.0.15", features = ["color", "derive", "std", "cargo", "string", "unicode"] }

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 \