From e61f92842ef46f53ff33f226bd2444979620a74c Mon Sep 17 00:00:00 2001 From: Dave Henderson Date: Tue, 17 Dec 2024 11:58:59 -0500 Subject: [PATCH] ci(fix): Attempt to fix release.yml Signed-off-by: Dave Henderson --- .github/workflows/release-please.yml | 18 ------------- .github/workflows/release.yml | 36 +++++++++++++------------- packaging/alpine/APKBUILD.tmpl | 38 ++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 37 deletions(-) create mode 100644 packaging/alpine/APKBUILD.tmpl diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 233e48572..97569b978 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -221,21 +221,3 @@ jobs: --repo ${{ github.repository }} env: GH_TOKEN: ${{ steps.app-token.outputs.token }} - deploy-homebrew: - runs-on: ubuntu-latest - needs: create-release - steps: - - uses: actions/create-github-app-token@v1 - id: app-token - with: - app-id: ${{ vars.APP_ID }} - private-key: ${{ secrets.PRIVATE_KEY }} - - name: Set up Homebrew - id: set-up-homebrew - uses: Homebrew/actions/setup-homebrew@master - - name: Bump packages - uses: Homebrew/actions/bump-packages@master - with: - token: ${{ steps.app-token.outputs.token }} - formulae: gomplate - fork: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5dd5e6aa8..53287657b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,6 +3,10 @@ name: Deploy Released Assets on: release: types: [published] + push: + branches: + - release-fix-attempt + workflow_dispatch: permissions: contents: write @@ -14,7 +18,8 @@ jobs: environment: name: aports env: - TAG_NAME: ${{ github.event.release.tag_name }} + # TAG_NAME: ${{ github.event.release.tag_name }} + TAG_NAME: v4.3.0 steps: - uses: actions/create-github-app-token@v1 id: app-token @@ -40,8 +45,8 @@ jobs: git config user.name "${{ github.actor }}" git config user.email "${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com" git clone https://gitlab.alpinelinux.org/hairyhenderson/aports.git - git remote add upstream https://gitlab.alpinelinux.org/alpine/aports.git cd aports + git remote add upstream https://gitlab.alpinelinux.org/alpine/aports.git git checkout master - name: update fork run: | @@ -74,29 +79,22 @@ jobs: environment: name: homebrew env: - TAG_NAME: ${{ github.event.release.tag_name }} + # TAG_NAME: ${{ github.event.release.tag_name }} + TAG_NAME: v4.3.0 steps: - uses: actions/create-github-app-token@v1 id: app-token with: app-id: ${{ vars.APP_ID }} private-key: ${{ secrets.PRIVATE_KEY }} - # - name: Retrieve release artifacts - # id: artifacts - # run: | - # # need the checksum and archive - # gh release download ${TAG_NAME} -p "${TAG_NAME}.sha*" - - # echo "sha256sum=$(cat ${TAG_NAME}.sha256)" >> $GITHUB_OUTPUT - # echo "archive=https://github.com/${{ github.repository }}/archive/refs/tags/${TAG_NAME}.tar.gz" >> $GITHUB_OUTPUT - # env: - # GH_TOKEN: ${{ steps.app-token.outputs.token }} - name: Set up Homebrew id: set-up-homebrew uses: Homebrew/actions/setup-homebrew@master - - name: Bump packages - uses: Homebrew/actions/bump-packages@master - with: - token: ${{ steps.app-token.outputs.token }} - formulae: gomplate - fork: false + - run: brew config + - run: brew doctor + # - name: Bump packages + # uses: Homebrew/actions/bump-packages@master + # with: + # token: ${{ steps.app-token.outputs.token }} + # formulae: gomplate + # fork: true diff --git a/packaging/alpine/APKBUILD.tmpl b/packaging/alpine/APKBUILD.tmpl new file mode 100644 index 000000000..388945975 --- /dev/null +++ b/packaging/alpine/APKBUILD.tmpl @@ -0,0 +1,38 @@ +# Maintainer: Dave Henderson +pkgname=gomplate +pkgver={{.version}} +pkgrel=0 +pkgdesc="A versatile Go template processor" +url="https://github.com/hairyhenderson/gomplate" +arch="all" +license="MIT" +depends="ca-certificates" +makedepends="go" +options="net" +source="$pkgname-$pkgver.tar.gz::https://github.com/hairyhenderson/gomplate/archive/v$pkgver.tar.gz" + +export GOFLAGS="$GOFLAGS -trimpath -modcacherw" +export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" +export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" +export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" + +build() { + # CGO needs to be able to be enabled for -buildmode=pie, setting it to an + # empty string is a workaround for now. + # See: https://gitlab.alpinelinux.org/alpine/aports/-/issues/15809 + make build \ + CGO_ENABLED= \ + VERSION="$pkgver" \ + COMMIT="unknown" +} + +check() { + # Note: make test (that runs go test -race) doesn't work. + go test -v +} + +package() { + install -D -m 755 bin/gomplate "$pkgdir"/usr/bin/gomplate +} + +sha512sums="{{.sha512}} gomplate-{{.version}}.tar.gz"