From 6abbbb9134f1f3179747fa1d3494a5aa6cf65937 Mon Sep 17 00:00:00 2001 From: Colin Hutchinson Date: Mon, 5 Dec 2022 19:57:08 +0000 Subject: [PATCH 1/3] chore(setup): remove references to the template repository --- .github/workflows/release.yaml | 4 ++-- .releaserc | 2 +- Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 3125636..2ae3a7e 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -58,7 +58,7 @@ jobs: id: meta uses: docker/metadata-action@v4 with: - images: ghcr.io/kong/template-github-release + images: ghcr.io/kong/kong-openresty sep-tags: ' ' flavor: | suffix=-${{ matrix.architecture }}-${{ matrix.ostype }} @@ -71,7 +71,7 @@ jobs: if: ${{ needs.release.outputs.published == 'true' }} run: | for tag in ${{ steps.meta.outputs.tags }}; do \ - docker tag ghcr.io/template-github-release:build-$ARCHITECTURE-$OSTYPE $tag && \ + docker tag ghcr.io/kong-openresty:build-$ARCHITECTURE-$OSTYPE $tag && \ docker push $tag; \ done - name: Archive the package diff --git a/.releaserc b/.releaserc index 2372c57..c9997c7 100644 --- a/.releaserc +++ b/.releaserc @@ -1,7 +1,7 @@ { "branches": ["main"], "tagFormat": "${version}", - "repositoryUrl": "https://github.com/kong/template-github-release.git", + "repositoryUrl": "https://github.com/kong/kong-openresty.git", "plugins": [ [ "@semantic-release/commit-analyzer", diff --git a/Makefile b/Makefile index 159617d..f5a9bca 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ ARCHITECTURE ?= x86_64 OSTYPE ?= linux-gnu DOCKER_TARGET ?= build DOCKER_REGISTRY ?= ghcr.io -DOCKER_IMAGE_NAME ?= template-github-release +DOCKER_IMAGE_NAME ?= kong-openresty DOCKER_IMAGE_TAG ?= $(DOCKER_TARGET)-$(ARCHITECTURE)-$(OSTYPE) DOCKER_NAME ?= $(DOCKER_REGISTRY)/$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG) DOCKER_RESULT ?= --load From b1049bc2fd5f9a004b9eb80458e149d70011eb77 Mon Sep 17 00:00:00 2001 From: Colin Hutchinson Date: Mon, 5 Dec 2022 19:57:37 +0000 Subject: [PATCH 2/3] chore(setup): we don't need the sync workflow --- .github/template-sync.yml | 19 ------------------- .github/workflows/sync.yml | 21 --------------------- 2 files changed, 40 deletions(-) delete mode 100644 .github/template-sync.yml delete mode 100644 .github/workflows/sync.yml diff --git a/.github/template-sync.yml b/.github/template-sync.yml deleted file mode 100644 index 5063a49..0000000 --- a/.github/template-sync.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -additional: -- kong-openssl - -files: -- '!README.md' -- '!.pre-commit-config.yaml' -- '!.secrets.baseline' -- '!**/template-sync.yml' -- '!.github/workflows/sync.yml' -- '!.github/PULL_REQUEST_TEMPLATE.md' -- '!**/CODEOWNERS' -- '!.yamllint' -- '!Dockerfile' -- '!build.sh' -- '!test.sh' -- '!.github/workflows/release.yaml' -- '!.releaserc' -- '!Makefile' diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml deleted file mode 100644 index e66e634..0000000 --- a/.github/workflows/sync.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -name: Sync the template repository - -on: # yamllint disable-line rule:truthy - pull_request: - push: - branches: - - main - -jobs: - sync: - runs-on: ubuntu-latest - steps: - - name: Queue - uses: ahmadnassri/action-workflow-queue@v1.1 - - name: Checkout - uses: actions/checkout@v3 - - name: Sync - uses: ahmadnassri/action-template-repository-sync@v2.2.0 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} From cd012513133e46274e828174693388163858e4a6 Mon Sep 17 00:00:00 2001 From: Colin Hutchinson Date: Mon, 5 Dec 2022 19:58:58 +0000 Subject: [PATCH 3/3] chore(setup): upon further consideration rename this repository --- .github/workflows/release.yaml | 4 ++-- .releaserc | 2 +- Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 2ae3a7e..5caf35b 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -58,7 +58,7 @@ jobs: id: meta uses: docker/metadata-action@v4 with: - images: ghcr.io/kong/kong-openresty + images: ghcr.io/kong/kong-runtime sep-tags: ' ' flavor: | suffix=-${{ matrix.architecture }}-${{ matrix.ostype }} @@ -71,7 +71,7 @@ jobs: if: ${{ needs.release.outputs.published == 'true' }} run: | for tag in ${{ steps.meta.outputs.tags }}; do \ - docker tag ghcr.io/kong-openresty:build-$ARCHITECTURE-$OSTYPE $tag && \ + docker tag ghcr.io/kong-runtime:build-$ARCHITECTURE-$OSTYPE $tag && \ docker push $tag; \ done - name: Archive the package diff --git a/.releaserc b/.releaserc index c9997c7..28943d2 100644 --- a/.releaserc +++ b/.releaserc @@ -1,7 +1,7 @@ { "branches": ["main"], "tagFormat": "${version}", - "repositoryUrl": "https://github.com/kong/kong-openresty.git", + "repositoryUrl": "https://github.com/kong/kong-runtime.git", "plugins": [ [ "@semantic-release/commit-analyzer", diff --git a/Makefile b/Makefile index f5a9bca..3b37e6f 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ ARCHITECTURE ?= x86_64 OSTYPE ?= linux-gnu DOCKER_TARGET ?= build DOCKER_REGISTRY ?= ghcr.io -DOCKER_IMAGE_NAME ?= kong-openresty +DOCKER_IMAGE_NAME ?= kong-runtime DOCKER_IMAGE_TAG ?= $(DOCKER_TARGET)-$(ARCHITECTURE)-$(OSTYPE) DOCKER_NAME ?= $(DOCKER_REGISTRY)/$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG) DOCKER_RESULT ?= --load