diff --git a/.dockerignore b/.dockerignore index e3e77af8c..dc77ef4db 100644 --- a/.dockerignore +++ b/.dockerignore @@ -11,7 +11,6 @@ .envrc .gitignore .golangci.yml -.goreleaser.yml .tbls.yml codecov.yml config.example.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0a104c4a1..95fbab1aa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -49,19 +49,10 @@ jobs: tags: | ghcr.io/traptitech/${{ env.IMAGE_NAME }}:latest ghcr.io/traptitech/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }} - goreleaser: + release: + name: Create Release runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - with: - # goreleaserがchangelogを生成する用 - fetch-depth: 0 - - uses: actions/setup-go@v5 - with: - go-version-file: "./go.mod" - - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v6 - with: - args: release --clean + - run: gh release create ${{ github.ref_name }} --generate-notes env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.goreleaser.yml b/.goreleaser.yml deleted file mode 100644 index 08ad43a64..000000000 --- a/.goreleaser.yml +++ /dev/null @@ -1,19 +0,0 @@ -# .goreleaser.yml -project_name: traQ -before: - hooks: - - go mod download -builds: - - binary: traQ - env: - - CGO_ENABLED=0 - ldflags: - - -s - - -w - - -X main.version={{.Version}} - - -X main.revision={{.ShortCommit}} - goarch: - - amd64 - - arm64 -archives: - - wrap_in_directory: true diff --git a/Makefile b/Makefile index 7f1a573b9..eb3fb730c 100644 --- a/Makefile +++ b/Makefile @@ -66,10 +66,6 @@ db-lint: ## Lint db docs according to .tbls.yml TRAQ_MARIADB_PORT=$(TEST_DB_PORT) go run main.go migrate --reset docker run --rm --net=host -e TBLS_DSN="mariadb://root:password@127.0.0.1:$(TEST_DB_PORT)/traq" -v $$PWD:/work -w /work ghcr.io/k1low/tbls:$(TBLS_VERSION) lint -c .tbls.yml -.PHONY: goreleaser-snapshot -goreleaser-snapshot: ## Release dry-run - @docker run --rm -it -v $$PWD:/src -w /src goreleaser/goreleaser --snapshot --skip-publish --rm-dist - .PHONY: update-frontend update-frontend: ## Update frontend files in dev/frontend @mkdir -p ./dev/frontend