diff --git a/.ci/pipelines/base.yml b/.ci/pipelines/base.yml index ce2682c..8d3cc77 100644 --- a/.ci/pipelines/base.yml +++ b/.ci/pipelines/base.yml @@ -6,30 +6,24 @@ resource_types: - name: gitea-package type: registry-image source: - repository: registry.sclu1034.dev/gitea-package - username: ((registry_user)) - password: ((registry_password)) + repository: registry.local:5000/gitea-package - name: gitea-status type: registry-image source: - repository: registry.sclu1034.dev/gitea-status - username: ((registry_user)) - password: ((registry_password)) + repository: registry.local:5000/gitea-status - name: gitea-pr type: registry-image source: - repository: registry.sclu1034.dev/gitea-pr - username: ((registry_user)) - password: ((registry_password)) + repository: registry.local:5000/gitea-pr resources: - name: repo type: git source: - uri: https://git.sclu1034.dev/bitsquid_dt/dtmt + uri: http://forgejo:3000/bitsquid_dt/dtmt branch: master - name: repo-pr @@ -44,7 +38,7 @@ resources: type: gitea-package source: access_token: ((gitea_api_key)) - url: https://git.sclu1034.dev + url: http://forgejo:3000 owner: bitsquid_dt type: generic name: dtmt @@ -54,7 +48,7 @@ resources: type: gitea-status source: access_token: ((gitea_api_key)) - url: https://git.sclu1034.dev + url: http://forgejo:3000 owner: bitsquid_dt repo: dtmt context: build/msvc @@ -64,7 +58,7 @@ resources: type: gitea-status source: access_token: ((gitea_api_key)) - url: https://git.sclu1034.dev + url: http://forgejo:3000 owner: bitsquid_dt repo: dtmt context: build/linux @@ -91,8 +85,6 @@ jobs: vars: pr: ((.:pr)) gitea_api_key: ((gitea_api_key)) - registry_user: ((registry_user)) - registry_password: ((registry_password)) instance_vars: number: ((.:pr.number)) @@ -200,7 +192,7 @@ jobs: vars: pr: "" target: linux - gitea_url: https://git.sclu1034.dev + gitea_url: http://forgejo:3000 gitea_api_key: ((gitea_api_key)) - load_var: version_number diff --git a/.ci/pipelines/pr.yml b/.ci/pipelines/pr.yml index 3198410..bca0ebb 100644 --- a/.ci/pipelines/pr.yml +++ b/.ci/pipelines/pr.yml @@ -6,30 +6,26 @@ resource_types: - name: gitea-package type: registry-image source: - repository: registry.sclu1034.dev/gitea-package - username: ((registry_user)) - password: ((registry_password)) + repository: registry.local:5000/gitea-package - name: gitea-status type: registry-image source: - repository: registry.sclu1034.dev/gitea-status - username: ((registry_user)) - password: ((registry_password)) + repository: registry.local:5000/gitea-status resources: - name: repo type: git source: - uri: https://git.sclu1034.dev/bitsquid_dt/dtmt + uri: http://forgejo:3000/bitsquid_dt/dtmt branch: ((pr.head.ref)) - name: gitea-package type: gitea-package source: access_token: ((gitea_api_key)) - url: https://git.sclu1034.dev + url: http://forgejo:3000 owner: bitsquid_dt type: generic name: dtmt @@ -38,7 +34,7 @@ resources: type: gitea-status source: access_token: ((gitea_api_key)) - url: https://git.sclu1034.dev + url: http://forgejo:3000 owner: bitsquid_dt repo: dtmt context: lint/clippy @@ -48,7 +44,7 @@ resources: type: gitea-status source: access_token: ((gitea_api_key)) - url: https://git.sclu1034.dev + url: http://forgejo:3000 owner: bitsquid_dt repo: dtmt context: build/msvc @@ -58,7 +54,7 @@ resources: type: gitea-status source: access_token: ((gitea_api_key)) - url: https://git.sclu1034.dev + url: http://forgejo:3000 owner: bitsquid_dt repo: dtmt context: build/linux @@ -139,7 +135,7 @@ jobs: vars: target: msvc pr: ((pr)) - gitea_url: https://git.sclu1034.dev + gitea_url: http://forgejo:3000 gitea_api_key: ((gitea_api_key)) - load_var: version_number @@ -197,7 +193,7 @@ jobs: vars: target: linux pr: ((pr)) - gitea_url: https://git.sclu1034.dev + gitea_url: http://forgejo:3000 gitea_api_key: ((gitea_api_key)) - load_var: version_number diff --git a/Justfile b/Justfile index 697bdcc..dbecc22 100644 --- a/Justfile +++ b/Justfile @@ -40,8 +40,6 @@ set-base-pipeline: --pipeline dtmt \ --config .ci/pipelines/base.yml \ -v gitea_api_key=${GITEA_API_KEY} \ - -v registry_user=${REGISTRY_USER} \ - -v registry_password=${REGISTRY_PASSWORD} \ -v owner=bitsquid_dt \ -v repo=dtmt @@ -50,7 +48,7 @@ set-pr-pipeline pr: -H "Authorization: ${GITEA_API_KEY}" \ -H 'Accept: application/json' \ '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 \ --pipeline dtmt-pr \ --config .ci/pipelines/pr.yml \