diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b439418..7409153 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,10 +18,13 @@ jobs: - name: Make run: make - - name: Run semantic-release - run: make semantic-release repo=${{ github.repository }} dry=false - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Create release + id: release + uses: go-semantic-release/action@v1.23 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + allow-initial-development-versions: true + force-bump-patch-version: true - name: Run GoReleaser run: make go-releaser snapshot=false diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml index 5f75c88..c186d97 100644 --- a/.github/workflows/review.yml +++ b/.github/workflows/review.yml @@ -17,10 +17,14 @@ jobs: - name: Make run: make - - name: Dry-run semantic-release - run: make semantic-release repo=${{ github.repository }} dry=true - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Dry-run release + id: release + uses: go-semantic-release/action@v1.23 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + allow-initial-development-versions: true + force-bump-patch-version: true + dry: true - name: Dry-run GoReleaser run: make go-releaser snapshot=true diff --git a/.sage/sagefile.go b/.sage/sagefile.go index c182e7d..b42bcbc 100644 --- a/.sage/sagefile.go +++ b/.sage/sagefile.go @@ -10,7 +10,6 @@ import ( "go.einride.tech/sage/tools/sggolangcilint" "go.einride.tech/sage/tools/sggoreleaser" "go.einride.tech/sage/tools/sggoreview" - "go.einride.tech/sage/tools/sggosemanticrelease" "go.einride.tech/sage/tools/sgmarkdownfmt" "go.einride.tech/sage/tools/sgyamlfmt" ) @@ -88,21 +87,6 @@ func TypescriptLint(ctx context.Context) error { ).Run() } -func SemanticRelease(ctx context.Context, repo string, dry bool) error { - sg.Logger(ctx).Println("triggering release...") - args := []string{ - "--allow-initial-development-versions", - "--allow-no-changes", - "--ci-condition=default", - "--provider=github", - "--provider-opt=slug=" + repo, - } - if dry { - args = append(args, "--dry") - } - return sggosemanticrelease.Command(ctx, args...).Run() -} - func GoReleaser(ctx context.Context, snapshot bool) error { sg.Logger(ctx).Println("building Go binary releases...") if err := sggit.Command(ctx, "fetch", "--force", "--tags").Run(); err != nil { diff --git a/Makefile b/Makefile index cb7ab26..9827e46 100644 --- a/Makefile +++ b/Makefile @@ -86,16 +86,6 @@ go-review: $(sagefile) go-test: $(sagefile) @$(sagefile) GoTest -.PHONY: semantic-release -semantic-release: $(sagefile) -ifndef repo - $(error missing argument repo="...") -endif -ifndef dry - $(error missing argument dry="...") -endif - @$(sagefile) SemanticRelease "$(repo)" "$(dry)" - .PHONY: typescript-lint typescript-lint: $(sagefile) @$(sagefile) TypescriptLint