From b95c3eb0409a844363f2bde0a5f5d9b2f8ab05e2 Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Sun, 26 Oct 2025 11:33:19 +1100 Subject: [PATCH] Switched back to release and CI workflows --- .forgejo/workflows/ci.yaml | 59 ------------------ .forgejo/workflows/release.yaml | 104 +++++++++++++++++++++----------- 2 files changed, 69 insertions(+), 94 deletions(-) diff --git a/.forgejo/workflows/ci.yaml b/.forgejo/workflows/ci.yaml index 9d0e0e6..9c83ed9 100644 --- a/.forgejo/workflows/ci.yaml +++ b/.forgejo/workflows/ci.yaml @@ -37,62 +37,3 @@ jobs: env: TEST_DYNAMO_URL: "http://localstack:4566" GOPRIVATE: "github:com/lmika/*" - - # Start Release - Site: - runs-on: docker - env: - NETLIFY_SITE_ID: 987651c8-4ffd-48d8-af67-4dbd49c48887 - NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }} - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Setup Go - uses: actions/setup-go@v3 - with: - go-version: 1.24 - - uses: actions/setup-node@v4 - with: - node-version: 21.1 - - name: Install Hugo - run: | - curl -LO https://github.com/gohugoio/hugo/releases/download/v0.146.0/hugo_extended_0.146.0_linux-amd64.deb - apt install -y ./hugo_extended_0.146.0_linux-amd64.deb - - name: Install Netlify CLI - run: | - npm install netlify-cli@15.0.1 -g - - name: Build Site - run: | - cd _site - mkdir -p themes - git clone https://github.com/alex-shpak/hugo-book.git themes/hugo-book - npm install - hugo --minify - - name: Publish Site - run: | - cd _site - netlify deploy --dir docs --prod - - 'Release MacOS': -# needs: build - runs-on: macos - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Setup Go - uses: actions/setup-go@v3 - with: - go-version: 1.25 - - name: Configure - run: | - git config --global url."https://${{ secrets.GO_MODULES_TOKEN }}:x-oauth-basic@github.com/lmika".insteadOf "https://github.com/lmika" - - name: Setup Goreleaser - run: | - go install github.com/goreleaser/goreleaser/v2@v2.12.7 - - name: Release - # if: startsWith(github.ref, 'refs/tags/') - run: | - goreleaser release -f macos.goreleaser.yml --skip=validate --clean --snapshot - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - HOMEBREW_TAP_PRIVATE_KEY: ${{ secrets.HOMEBREW_TAP_PRIVATE_KEY }} \ No newline at end of file diff --git a/.forgejo/workflows/release.yaml b/.forgejo/workflows/release.yaml index 4e237b2..1bde0c6 100644 --- a/.forgejo/workflows/release.yaml +++ b/.forgejo/workflows/release.yaml @@ -1,11 +1,12 @@ -name: release +name: Release on: push: tags: - 'v*' + jobs: - build: + Build: runs-on: docker services: localstack: @@ -20,7 +21,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version: 1.24 + go-version: 1.25 - name: Configure run: | git config --global url."https://${{ secrets.GO_MODULES_TOKEN }}:x-oauth-basic@github.com/lmika".insteadOf "https://github.com/lmika" @@ -30,53 +31,86 @@ jobs: go get ./... go test -p 1 ./... env: - GOPRIVATE: "github:com/lmika/*" TEST_DYNAMO_URL: "http://localstack:4566" + GOPRIVATE: "github:com/lmika/*" - release-macos: - needs: build - runs-on: macos-12 + Site: + needs: Build + runs-on: docker + env: + NETLIFY_SITE_ID: 987651c8-4ffd-48d8-af67-4dbd49c48887 + NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }} steps: - name: Checkout uses: actions/checkout@v2 - name: Setup Go uses: actions/setup-go@v3 with: - go-version: 1.22 + go-version: 1.24 + - uses: actions/setup-node@v4 + with: + node-version: 21.1 + - name: Install Hugo + run: | + curl -LO https://github.com/gohugoio/hugo/releases/download/v0.146.0/hugo_extended_0.146.0_linux-amd64.deb + apt install -y ./hugo_extended_0.146.0_linux-amd64.deb + - name: Install Netlify CLI + run: | + npm install netlify-cli@15.0.1 -g + - name: Build Site + run: | + cd _site + mkdir -p themes + git clone https://github.com/alex-shpak/hugo-book.git themes/hugo-book + npm install + hugo --minify + - name: Publish Site + run: | + cd _site + netlify deploy --dir docs --prod + + 'Release MacOS': + needs: Build + runs-on: macos + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Setup Go + uses: actions/setup-go@v3 + with: + go-version: 1.25 - name: Configure run: | git config --global url."https://${{ secrets.GO_MODULES_TOKEN }}:x-oauth-basic@github.com/lmika".insteadOf "https://github.com/lmika" - name: Setup Goreleaser run: | - brew install goreleaser/tap/goreleaser - brew install goreleaser + go install github.com/goreleaser/goreleaser/v2@v2.12.7 - name: Release - if: startsWith(github.ref, 'refs/tags/') run: | - goreleaser release -f macos.goreleaser.yml --skip=validate --clean + goreleaser publish -f macos.goreleaser.yml --skip=validate --clean env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - HOMEBREW_GITHUB_TOKEN: ${{ secrets.HOMEBREW_GITHUB_TOKEN }} + HOMEBREW_TAP_PRIVATE_KEY: ${{ secrets.HOMEBREW_TAP_PRIVATE_KEY }} - release-linux: - needs: build - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Setup Go - uses: actions/setup-go@v3 - with: - go-version: 1.22 - - name: Configure - run: | - git config --global url."https://${{ secrets.GO_MODULES_TOKEN }}:x-oauth-basic@github.com/lmika".insteadOf "https://github.com/lmika" - - name: Release - uses: goreleaser/goreleaser-action@v1 - if: startsWith(github.ref, 'refs/tags/') - with: - version: latest - args: release -f linux.goreleaser.yml --skip=validate --clean - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - HOMEBREW_GITHUB_TOKEN: ${{ secrets.HOMEBREW_GITHUB_TOKEN }} \ No newline at end of file +# release-linux: +# needs: build +# runs-on: ubuntu-latest +# steps: +# - name: Checkout +# uses: actions/checkout@v2 +# - name: Setup Go +# uses: actions/setup-go@v3 +# with: +# go-version: 1.22 +# - name: Configure +# run: | +# git config --global url."https://${{ secrets.GO_MODULES_TOKEN }}:x-oauth-basic@github.com/lmika".insteadOf "https://github.com/lmika" +# - name: Release +# uses: goreleaser/goreleaser-action@v1 +# if: startsWith(github.ref, 'refs/tags/') +# with: +# version: latest +# args: release -f linux.goreleaser.yml --skip=validate --clean +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# HOMEBREW_GITHUB_TOKEN: ${{ secrets.HOMEBREW_GITHUB_TOKEN }} \ No newline at end of file