Merge pull request #964 from twpayne/update-release-process

Update release process
twpayne · Dec 20, 2020 · 11ed57d · 11ed57d
2 parents 115be3e + a8de684
commit 11ed57d
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 28 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -38,9 +38,10 @@ jobs:
   test-release:
     runs-on: ubuntu-latest
     steps:
-    - name: Install musl
+    - name: Install build dependencies
       run: |
-        sudo apt install -y musl-tools
+        sudo apt-get update
+        sudo apt-get -yq --no-install-suggests --no-install-recommends install musl-tools snapcraft
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
@@ -54,10 +55,6 @@ jobs:
           ${{ runner.os }}-go-
     - name: Checkout
       uses: actions/checkout@v2
-    - name: Install snapcraft
-      run: |
-        sudo apt-get update
-        sudo apt-get -yq --no-install-suggests --no-install-recommends install snapcraft
     - name: Build release
       uses: goreleaser/goreleaser-action@v2
       with:
@@ -109,9 +106,10 @@ jobs:
     - test-release
     runs-on: ubuntu-latest
     steps:
-    - name: Install musl
+    - name: Install build dependencies
       run: |
-        sudo apt install -y musl-tools
+        sudo apt-get update
+        sudo apt-get -yq --no-install-suggests --no-install-recommends install musl-tools snapcraft
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
@@ -125,16 +123,11 @@ jobs:
           ${{ runner.os }}-go-
     - name: Checkout
       uses: actions/checkout@v2
-    - name: Install snapcraft
-      run: |
-        sudo apt-get update
-        sudo apt-get -yq --no-install-suggests --no-install-recommends install snapcraft
     - name: Snapcraft Login
-      if: success() && startsWith(github.ref, 'refs/tags/v')
       env:
         SNAPCRAFT_LOGIN: ${{ secrets.SNAPCRAFT_LOGIN }}
       run: |
-        snapcraft login --with <(echo "$SNAPCRAFT_LOGIN")
+        snapcraft login --with <(echo "$SNAPCRAFT_LOGIN" | base64 -d)
     - name: Release
       uses: goreleaser/goreleaser-action@v2
       with:

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -71,6 +71,12 @@ archives:
   - goos: windows
     format: zip
 
+changelog:
+  sort: asc
+  filters:
+    exclude:
+    - "Merge pull request"
+
 checksum:
 
 nfpms:
@@ -108,6 +114,18 @@ nfpms:
         arm64: aarch64
       files:
         "completions/chezmoi.zsh": "/usr/share/zsh/functions/_chezmoi"
+- id: apks
+  builds:
+  - chezmoi-cgo-musl
+  - chezmoi-nocgo
+  vendor: "Tom Payne <[email protected]>"
+  homepage: "https://chezmoi.io/"
+  maintainer: "Tom Payne <[email protected]>"
+  description: "Manage your dotfiles across multiple diverse machines, securely."
+  license: MIT
+  formats:
+  - apk
+  bindir: /usr/bin
 
 release:
 

diff --git a/cmd/docs.gen.go b/cmd/docs.gen.go
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
@@ -107,11 +107,22 @@ To build a test release, without publishing, (Linux only) run:
 
     make test-release
 
-To create a new release, create and push a tag, e.g.:
+Publish a new release by creating and pushing a tag, e.g.:
 
     git tag v1.2.3
     git push --tags
 
+This triggers a [GitHub Action](https://github.com/twpayne/chezmoi/actions) that
+builds and publishes archives, packages, and snaps, and creates a new [GitHub
+Release](https://github.com/twpayne/chezmoi/releases).
+
+Publishing [Snaps](https://snapcraft.io/) requires a `SNAPCRAFT_LOGIN`
+[repository
+secret](https://github.com/twpayne/chezmoi/settings/secrets/actions). Snapcraft
+logins periodically expire. Create a new snapcraft login by running:
+
+    snapcraft export-login --snaps=chezmoi --channels=stable --acls=package_upload -
+
 [brew](https://brew.sh/) formula must be updated manually with the command:
 
     brew bump-formula-pr --tag=v1.2.3 chezmoi

diff --git a/docs/INSTALL.md b/docs/INSTALL.md
@@ -39,12 +39,13 @@ Install chezmoi with a single command.
 Download a package for your operating system and architecture and install it
 with your package manager.
 
-| Distribution | Architectures                                             | Package                                                                   |
-| ------------ | --------------------------------------------------------- | ------------------------------------------------------------------------- |
-| Debian       | `amd64`, `arm64`, `armel`, `i386`, `ppc64`, `ppc64le`     | [`deb`](https://github.com/twpayne/chezmoi/releases/latest)               |
-| RedHat       | `aarch64`, `armhfp`, `i686`, `ppc64`, `ppc64le`, `x86_64` | [`rpm`](https://github.com/twpayne/chezmoi/releases/latest)               |
-| OpenSUSE     | `aarch64`, `armhfp`, `i686`, `ppc64`, `ppc64le`, `x86_64` | [`rpm`](https://github.com/twpayne/chezmoi/releases/latest)               |
-| Ubuntu       | `amd64`, `arm64`, `armel`, `i386`, `ppc64`, `ppc64le`     | [`deb`](https://github.com/twpayne/chezmoi/releases/latest)               |
+| Distribution | Architectures                                             | Package                                                     |
+| ------------ | --------------------------------------------------------- | ----------------------------------------------------------- |
+| Alpine       | `386`, `amd64`, `arm64`, `arm`, `ppc64`, `ppc64le`        | [`apk`](https://github.com/twpayne/chezmoi/releases/latest) |
+| Debian       | `amd64`, `arm64`, `armel`, `i386`, `ppc64`, `ppc64le`     | [`deb`](https://github.com/twpayne/chezmoi/releases/latest) |
+| RedHat       | `aarch64`, `armhfp`, `i686`, `ppc64`, `ppc64le`, `x86_64` | [`rpm`](https://github.com/twpayne/chezmoi/releases/latest) |
+| OpenSUSE     | `aarch64`, `armhfp`, `i686`, `ppc64`, `ppc64le`, `x86_64` | [`rpm`](https://github.com/twpayne/chezmoi/releases/latest) |
+| Ubuntu       | `amd64`, `arm64`, `armel`, `i386`, `ppc64`, `ppc64le`     | [`deb`](https://github.com/twpayne/chezmoi/releases/latest) |
 
 ## Pre-built binaries