diff --git a/assets/templates/ci_default/.gitea/workflows/default_nottags.yaml b/assets/templates/ci_default/.gitea/workflows/default_nottags.yaml index 27946ca..cafd303 100644 --- a/assets/templates/ci_default/.gitea/workflows/default_nottags.yaml +++ b/assets/templates/ci_default/.gitea/workflows/default_nottags.yaml @@ -7,7 +7,7 @@ on: env: IMAGE: code.foss.global/host.today/ht-docker-node:npmci - NPMCI_COMPUTED_REPOURL: https://${-{gitea.repository_owner}-}:${-{secrets.GITEA_TOKEN}-}@{{git.host}}/${-{gitea.repository}-}.git + NPMCI_COMPUTED_REPOURL: https://${-{gitea.repository_owner}-}:${-{secrets.GITEA_TOKEN}-}@{{module.githost}}/${-{gitea.repository}-}.git NPMCI_TOKEN_NPM: ${-{secrets.NPMCI_TOKEN_NPM}-} NPMCI_TOKEN_NPM2: ${-{secrets.NPMCI_TOKEN_NPM2}-} NPMCI_GIT_GITHUBTOKEN: ${-{secrets.NPMCI_GIT_GITHUBTOKEN}-} diff --git a/assets/templates/ci_default/.gitea/workflows/default_tags.yaml b/assets/templates/ci_default/.gitea/workflows/default_tags.yaml index c42953d..2b1e34d 100644 --- a/assets/templates/ci_default/.gitea/workflows/default_tags.yaml +++ b/assets/templates/ci_default/.gitea/workflows/default_tags.yaml @@ -7,7 +7,7 @@ on: env: IMAGE: code.foss.global/host.today/ht-docker-node:npmci - NPMCI_COMPUTED_REPOURL: https://${-{gitea.repository_owner}-}:${-{secrets.GITEA_TOKEN}-}@{{git.host}}/${-{gitea.repository}-}.git + NPMCI_COMPUTED_REPOURL: https://${-{gitea.repository_owner}-}:${-{secrets.GITEA_TOKEN}-}@{{module.githost}}/${-{gitea.repository}-}.git NPMCI_TOKEN_NPM: ${-{secrets.NPMCI_TOKEN_NPM}-} NPMCI_TOKEN_NPM2: ${-{secrets.NPMCI_TOKEN_NPM2}-} NPMCI_GIT_GITHUBTOKEN: ${-{secrets.NPMCI_GIT_GITHUBTOKEN}-} diff --git a/assets/templates/ci_default_private/.gitea/workflows/default_nottags.yaml b/assets/templates/ci_default_private/.gitea/workflows/default_nottags.yaml index c73bde6..44b47c9 100644 --- a/assets/templates/ci_default_private/.gitea/workflows/default_nottags.yaml +++ b/assets/templates/ci_default_private/.gitea/workflows/default_nottags.yaml @@ -7,7 +7,7 @@ on: env: IMAGE: code.foss.global/hosttoday/ht-docker-node:npmci - NPMCI_COMPUTED_REPOURL: https://${-{gitea.repository_owner}-}:${-{secrets.GITEA_TOKEN}-}@{{git.host}}/${-{gitea.repository}-}.git + NPMCI_COMPUTED_REPOURL: https://${-{gitea.repository_owner}-}:${-{secrets.GITEA_TOKEN}-}@{{module.githost}}/${-{gitea.repository}-}.git NPMCI_TOKEN_NPM: ${-{secrets.NPMCI_TOKEN_NPM}-} NPMCI_TOKEN_NPM2: ${-{secrets.NPMCI_TOKEN_NPM2}-} NPMCI_GIT_GITHUBTOKEN: ${-{secrets.NPMCI_GIT_GITHUBTOKEN}-} diff --git a/assets/templates/ci_default_private/.gitea/workflows/default_tags.yaml b/assets/templates/ci_default_private/.gitea/workflows/default_tags.yaml index 085e9cb..d85ed38 100644 --- a/assets/templates/ci_default_private/.gitea/workflows/default_tags.yaml +++ b/assets/templates/ci_default_private/.gitea/workflows/default_tags.yaml @@ -7,7 +7,7 @@ on: env: IMAGE: code.foss.global/hosttoday/ht-docker-node:npmci - NPMCI_COMPUTED_REPOURL: https://${-{gitea.repository_owner}-}:${-{secrets.GITEA_TOKEN}-}@{{git.host}}/${-{gitea.repository}-}.git + NPMCI_COMPUTED_REPOURL: https://${-{gitea.repository_owner}-}:${-{secrets.GITEA_TOKEN}-}@{{module.githost}}/${-{gitea.repository}-}.git NPMCI_TOKEN_NPM: ${-{secrets.NPMCI_TOKEN_NPM}-} NPMCI_TOKEN_NPM2: ${-{secrets.NPMCI_TOKEN_NPM2}-} NPMCI_GIT_GITHUBTOKEN: ${-{secrets.NPMCI_GIT_GITHUBTOKEN}-} diff --git a/assets/templates/ci_docker/.gitea/workflows/docker_nottags.yaml b/assets/templates/ci_docker/.gitea/workflows/docker_nottags.yaml index f361f62..710a3a3 100644 --- a/assets/templates/ci_docker/.gitea/workflows/docker_nottags.yaml +++ b/assets/templates/ci_docker/.gitea/workflows/docker_nottags.yaml @@ -7,7 +7,7 @@ on: env: IMAGE: code.foss.global/hosttoday/ht-docker-node:npmci - NPMCI_COMPUTED_REPOURL: https://${-{gitea.repository_owner}-}:${-{secrets.GITEA_TOKEN}-}@{{git.host}}/${-{gitea.repository}-}.git + NPMCI_COMPUTED_REPOURL: https://${-{gitea.repository_owner}-}:${-{secrets.GITEA_TOKEN}-}@{{module.githost}}/${-{gitea.repository}-}.git NPMCI_TOKEN_NPM: ${-{secrets.NPMCI_TOKEN_NPM}-} NPMCI_TOKEN_NPM2: ${-{secrets.NPMCI_TOKEN_NPM2}-} NPMCI_GIT_GITHUBTOKEN: ${-{secrets.NPMCI_GIT_GITHUBTOKEN}-} diff --git a/assets/templates/ci_docker/.gitea/workflows/docker_tags.yaml b/assets/templates/ci_docker/.gitea/workflows/docker_tags.yaml index 27132a9..4571292 100644 --- a/assets/templates/ci_docker/.gitea/workflows/docker_tags.yaml +++ b/assets/templates/ci_docker/.gitea/workflows/docker_tags.yaml @@ -7,7 +7,7 @@ on: env: IMAGE: code.foss.global/hosttoday/ht-docker-node:npmci - NPMCI_COMPUTED_REPOURL: https://${-{gitea.repository_owner}-}:${-{secrets.GITEA_TOKEN}-}@{{git.host}}/${-{gitea.repository}-}.git + NPMCI_COMPUTED_REPOURL: https://${-{gitea.repository_owner}-}:${-{secrets.GITEA_TOKEN}-}@{{module.githost}}/${-{gitea.repository}-}.git NPMCI_TOKEN_NPM: ${-{secrets.NPMCI_TOKEN_NPM}-} NPMCI_TOKEN_NPM2: ${-{secrets.NPMCI_TOKEN_NPM2}-} NPMCI_GIT_GITHUBTOKEN: ${-{secrets.NPMCI_GIT_GITHUBTOKEN}-} @@ -89,8 +89,8 @@ jobs: npmci docker login npmci docker build npmci docker test - # npmci docker push {{git.host}} - npmci docker push {{git.host}} + # npmci docker push {{module.githost}} + npmci docker push {{module.githost}} metadata: needs: test diff --git a/assets/templates/service/.package.json b/assets/templates/service/.package.json index 80e080e..623fef8 100644 --- a/assets/templates/service/.package.json +++ b/assets/templates/service/.package.json @@ -21,14 +21,14 @@ fileName: package.json "@git.zone/tsrun": "^1.2.8", "@git.zone/tstest": "^1.0.28", "@git.zone/tswatch": "^2.0.1", - "@push.rocks/tapbundle": "^5.0.3" + "@push.rocks/tapbundle": "^5.5.4" }, "dependencies": { - "@api.global/typedserver": "^1.0.24", + "@api.global/typedserver": "^3.0.53", "@push.rocks/projectinfo": "^5.0.1", - "@push.rocks/qenv": "^4.0.10", + "@push.rocks/qenv": "^6.1.0", "@push.rocks/smartdata": "^5.0.7", "@push.rocks/smartpath": "^5.0.5", "@push.rocks/smartstate": "^2.0.0" - } + }, } diff --git a/changelog.md b/changelog.md index f847d4d..485d7c1 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,11 @@ # Changelog +## 2025-01-01 - 1.10.8 - fix(assets/templates) +Update CI template configurations to use module.githost + +- Replaced occurrences of {{git.host}} with {{module.githost}} in CI workflow files +- Updated package dependencies for service template + ## 2024-12-26 - 1.10.7 - fix(assets) Correct URLs in templates and fix TypeScript declaration diff --git a/ts/00_commitinfo_data.ts b/ts/00_commitinfo_data.ts index 4f857ac..780147d 100644 --- a/ts/00_commitinfo_data.ts +++ b/ts/00_commitinfo_data.ts @@ -3,6 +3,6 @@ */ export const commitinfo = { name: '@git.zone/cli', - version: '1.10.7', + version: '1.10.8', description: 'A CLI toolbelt to streamline local development cycles by using various gitzone utilities.' }