Compare commits

...

5 commits

Author SHA1 Message Date
8a4dab34ec
chore(deps): update rust crate strip-ansi-escapes to v0.2.1
Some checks are pending
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:37 +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 37 additions and 34 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

21
Cargo.lock generated
View file

@ -3408,9 +3408,9 @@ dependencies = [
[[package]] [[package]]
name = "strip-ansi-escapes" name = "strip-ansi-escapes"
version = "0.2.0" version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55ff8ef943b384c414f54aefa961dd2bd853add74ec75e7ac74cf91dba62bcfa" checksum = "2a8f8038e7e7969abb3f1b7c2a811225e9296da208539e0f79c5251d6cac0025"
dependencies = [ dependencies = [
"vte", "vte",
] ]
@ -4164,22 +4164,11 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
[[package]] [[package]]
name = "vte" name = "vte"
version = "0.11.1" version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197" checksum = "231fdcd7ef3037e8330d8e17e61011a2c244126acc0a982f4040ac3f9f0bc077"
dependencies = [ dependencies = [
"utf8parse", "memchr",
"vte_generate_state_changes",
]
[[package]]
name = "vte_generate_state_changes"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e369bee1b05d510a7b4ed645f5faa90619e05437111783ea5848f28d97d3c2e"
dependencies = [
"proc-macro2",
"quote",
] ]
[[package]] [[package]]

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