From 15ac9a9383aafd4f4d97912d54bf7dba72b587c1 Mon Sep 17 00:00:00 2001 From: i544c Date: Wed, 7 Aug 2024 23:48:32 +0900 Subject: [PATCH 1/2] fix: fix build image workflow --- .github/workflows/docker-custom.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-custom.yml b/.github/workflows/docker-custom.yml index 5a95fdfb6190..1c3e9716cf9d 100644 --- a/.github/workflows/docker-custom.yml +++ b/.github/workflows/docker-custom.yml @@ -17,6 +17,10 @@ env: type=semver,pattern={{major}}.{{minor}} type=semver,pattern={{major}} +permissions: + contents: read + packages: write + jobs: # see https://docs.docker.com/build/ci/github-actions/multi-platform/#distribute-build-across-multiple-runners build: @@ -41,7 +45,7 @@ jobs: id: meta uses: docker/metadata-action@v5 with: - images: ${{ env.REGISTRY_IMAGE }} + images: ${{ env.REGISTRY }}/${{ env.REGISTRY_IMAGE }} tags: ${{ env.TAGS }} - name: Log in to Docker Hub uses: docker/login-action@v3 @@ -60,7 +64,7 @@ jobs: labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max - outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true + outputs: type=image,name=${{ env.REGISTRY }}/${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true - name: Export digest run: | mkdir -p /tmp/digests @@ -91,7 +95,7 @@ jobs: id: meta uses: docker/metadata-action@v5 with: - images: ${{ env.REGISTRY_IMAGE }} + images: ${{ env.REGISTRY }}/${{ env.REGISTRY_IMAGE }} tags: ${{ env.TAGS }} - name: Login to Docker Hub uses: docker/login-action@v3 @@ -103,8 +107,8 @@ jobs: working-directory: /tmp/digests run: | docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ - $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *) + $(printf '${{ env.REGISTRY }}/${{ env.REGISTRY_IMAGE }}@sha256:%s ' *) - name: Inspect image run: | - docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }} + docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }} From a1af9ee6eb0955bf41880080354d122d1721dc59 Mon Sep 17 00:00:00 2001 From: i544c Date: Thu, 8 Aug 2024 00:01:18 +0900 Subject: [PATCH 2/2] chore: update misskey-2024.7.0-buiso.2 --- package.json | 2 +- packages/misskey-js/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c3e51e83672c..2226ad3797df 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "buicha-social-misskey", - "version": "2024.7.0-buiso.1", + "version": "2024.7.0-buiso.2", "codename": "nasubi", "repository": { "type": "git", diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json index 3fb0cc60f0d5..99328c9909b1 100644 --- a/packages/misskey-js/package.json +++ b/packages/misskey-js/package.json @@ -1,7 +1,7 @@ { "type": "module", "name": "misskey-js", - "version": "2024.7.0-buiso.1", + "version": "2024.7.0-buiso.2", "description": "Misskey SDK for JavaScript", "license": "MIT", "main": "./built/index.js",