diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index d0af21d5..b9ea9aa7 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -26,19 +26,6 @@ jobs: with: cache: false go-version: "1.22" - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v2 - with: - buildkitd-flags: --debug - - name: Login to GitHub Container Registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - name: Run GoReleaser uses: goreleaser/goreleaser-action@v4 with: @@ -59,14 +46,3 @@ jobs: AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - - name: Push Docker Images - run: | - VERSION=v$(cat releases/metadata.json | jq -r .version) - IMAGES=$(docker images --format "{{.Repository}}:{{.Tag}}" | grep "$VERSION") - for i in ${IMAGES}; do - docker push $i - done - docker manifest create ghcr.io/gptscript-ai/gptscript:main ${IMAGES} - docker manifest push ghcr.io/gptscript-ai/gptscript:main - docker manifest create ghcr.io/gptscript-ai/gptscript:${VERSION} ${IMAGES} - docker manifest push ghcr.io/gptscript-ai/gptscript:${VERSION} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 9b3b51eb..3fe23c34 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -21,19 +21,6 @@ jobs: with: cache: false go-version: "1.22" - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v2 - with: - buildkitd-flags: --debug - - name: Login to GitHub Container Registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - name: Run GoReleaser uses: goreleaser/goreleaser-action@v4 with: diff --git a/.goreleaser.yml b/.goreleaser.yml index fc9b8483..99b892f5 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -65,43 +65,3 @@ brews: owner: gptscript-ai name: homebrew-tap token: "{{ .Env.GH_PROJECT_TOKEN }}" - -dockers: - - use: buildx - goos: linux - goarch: amd64 - image_templates: - - ghcr.io/gptscript-ai/gptscript:v{{ .Version }}-amd64 - build_flag_templates: - - "--pull" - - "--label=org.opencontainers.image.created={{.Date}}" - - "--label=org.opencontainers.image.title={{.ProjectName}}" - - "--label=org.opencontainers.image.revision={{.FullCommit}}" - - "--label=org.opencontainers.image.version={{.Version}}" - - "--label=org.opencontainers.image.source=https://github.com/gptscript-ai/gptscript" - - "--platform=linux/amd64" - - use: buildx - goos: linux - goarch: arm64 - image_templates: - - ghcr.io/gptscript-ai/gptscript:v{{ .Version }}-arm64 - build_flag_templates: - - "--pull" - - "--label=org.opencontainers.image.created={{.Date}}" - - "--label=org.opencontainers.image.title={{.ProjectName}}" - - "--label=org.opencontainers.image.revision={{.FullCommit}}" - - "--label=org.opencontainers.image.version={{.Version}}" - - "--label=org.opencontainers.image.source=https://github.com/gptscript-ai/gptscript" - - "--platform=linux/arm64" - -docker_manifests: - - use: docker - name_template: ghcr.io/gptscript-ai/gptscript:v{{ .Version }} - image_templates: - - ghcr.io/gptscript-ai/gptscript:v{{ .Version }}-amd64 - - ghcr.io/gptscript-ai/gptscript:v{{ .Version }}-arm64 - - use: docker - name_template: ghcr.io/gptscript-ai/gptscript:latest - image_templates: - - ghcr.io/gptscript-ai/gptscript:v{{ .Version }}-amd64 - - ghcr.io/gptscript-ai/gptscript:v{{ .Version }}-arm64