Compare commits
5 commits
42919419df
...
3f8a4caa5d
Author | SHA1 | Date | |
---|---|---|---|
3f8a4caa5d | |||
c6f9e2a369 | |||
5aa8421f7d | |||
df79c59dc2 | |||
e61a252ee6 |
4 changed files with 47 additions and 33 deletions
|
@ -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
|
||||||
|
|
|
@ -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
30
Cargo.lock
generated
|
@ -770,15 +770,6 @@ dependencies = [
|
||||||
"dirs-sys",
|
"dirs-sys",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "dirs"
|
|
||||||
version = "5.0.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
|
|
||||||
dependencies = [
|
|
||||||
"dirs-sys",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "dirs-next"
|
name = "dirs-next"
|
||||||
version = "2.0.0"
|
version = "2.0.0"
|
||||||
|
@ -1631,6 +1622,15 @@ version = "0.3.9"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
|
checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "home"
|
||||||
|
version = "0.5.11"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
|
||||||
|
dependencies = [
|
||||||
|
"windows-sys 0.59.0",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "http"
|
name = "http"
|
||||||
version = "1.1.0"
|
version = "1.1.0"
|
||||||
|
@ -3379,12 +3379,12 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "steamlocate"
|
name = "steamlocate"
|
||||||
version = "2.0.0-beta.2"
|
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 = "c3b6a4810c4e7fecb0123a9a8ba99b335c17d92e636c265ef99108ee4734c812"
|
checksum = "a13160bc6ea5cd80cde195ad4a4c629701db2bf397b62c139aa9e739016d2499"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"crc",
|
"crc",
|
||||||
"dirs",
|
"home",
|
||||||
"keyvalues-parser",
|
"keyvalues-parser",
|
||||||
"keyvalues-serde",
|
"keyvalues-serde",
|
||||||
"serde",
|
"serde",
|
||||||
|
@ -4551,12 +4551,12 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "winreg"
|
name = "winreg"
|
||||||
version = "0.51.0"
|
version = "0.55.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc"
|
checksum = "cb5a765337c50e9ec252c2069be9bf91c7df47afb103b642ba3a53bf8101be97"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"windows-sys 0.48.0",
|
"windows-sys 0.59.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
4
Justfile
4
Justfile
|
@ -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 \
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue