diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
deleted file mode 100644
index eb5b802..0000000
--- a/.github/workflows/deploy.yml
+++ /dev/null
@@ -1,160 +0,0 @@
-name: Release
-
-on:
- workflow_dispatch:
- push:
- tags:
- - 'v[0-9]+.[0-9]+.[0-9]+'
-
-jobs:
- build:
- strategy:
- matrix:
- name:
- - linux-x86-64-gnu
- # - linux-x86-64-musl
- # - linux-armhf-gnu
- # - linux-arm64-gnu
- # - mac-x86-64
- # - mac-arm64
- include:
- - name: linux-x86-64-gnu
- os: ubuntu-20.04
- target: x86_64-unknown-linux-gnu
- cross: false
- experimental: false
-
- # - name: linux-x86-64-musl
- # os: ubuntu-latest
- # target: x86_64-unknown-linux-musl
- # cross: true
- # experimental: false
-
- # - name: linux-armhf-gnu
- # os: ubuntu-20.04
- # target: armv7-unknown-linux-gnueabihf
- # cross: true
- # experimental: false
-
- # - name: linux-arm64-gnu
- # os: ubuntu-20.04
- # target: aarch64-unknown-linux-gnu
- # cross: true
- # experimental: false
-
- # - name: mac-x86-64
- # os: macos-latest
- # target: x86_64-apple-darwin
- # cross: false
- # experimental: false
-
- # - name: mac-arm64
- # os: macos-11.0
- # target: aarch64-apple-darwin
- # cross: true
- # experimental: true
-
- name: Binaries for ${{ matrix.name }}
- runs-on: ${{ matrix.os }}
- continue-on-error: ${{ matrix.experimental }}
-
- steps:
- - uses: actions/checkout@v4
- - uses: actions/cache@v3
- with:
- path: ~/.cargo/registry
- key: ${{ runner.os }}-cargo-registry-${{ hashFiles('Cargo.lock') }}
-
- - uses: actions/cache@v3
- if: startsWith(matrix.name, 'linux-')
- with:
- path: ~/.cargo/bin
- key: ${{ runner.os }}-cargo-bin-${{ hashFiles('.github/workflows/release.yml') }}
-
- - uses: dtolnay/rust-toolchain@stable
- with:
- targets: ${{ matrix.target }}
-
- - uses: taiki-e/setup-cross-toolchain-action@v1
- with:
- # NB: sets CARGO_BUILD_TARGET evar - do not need --target flag in build
- target: ${{ matrix.target }}
-
- - uses: taiki-e/install-action@cross
- if: ${{ matrix.cross }}
-
- - run: cargo build --release --locked
-
- # - name: Extract version
- # shell: bash
- # run: |
- # set -euxo pipefail
-
- # version=$(grep -m1 -F 'version =' Cargo.toml | cut -d\" -f2)
-
- # if [[ -z "$version" ]]; then
- # echo "Error: no version :("
- # exit 1
- # fi
-
- # echo "$version" > VERSION
-
- # - name: Package
- # shell: bash
- # run: |
- # set -euxo pipefail
- # ext=""
- # [[ "${{ matrix.name }}" == windows-* ]] && ext=".exe"
- # bin="target/${{ matrix.target }}/release/keyweave${ext}"
- # strip "$bin" || true
- # dst="keyweave-${{ matrix.target }}"
- # mkdir "$dst"
- # cp "$bin" "$dst/"
-
- # - name: Archive (tar)
- # if: '! startsWith(matrix.name, ''windows-'')'
- # shell: bash
- # run: |
- # set -euxo pipefail
- # dst="keyweave-${{ matrix.target }}"
- # tar cavf "$dst.tar.xz" "$dst"
-
- # - uses: actions/upload-artifact@v3
- # with:
- # name: builds
- # retention-days: 1
- # path: |
- # keyweave-*.tar.xz
-
- # sign:
- # needs: build
-
- # name: Checksum and sign
- # runs-on: ubuntu-latest
- # permissions:
- # id-token: write
- # contents: write
-
- # steps:
- # - uses: actions/checkout@v4
- # - uses: actions/cache@v3
- # with:
- # path: ~/.cargo/bin
- # key: sign-tools-${{ hashFiles('.github/workflows/release.yml') }}
-
- # - uses: actions/download-artifact@v3
- # with:
- # name: builds
-
- # - name: Checksums with SHA512
- # run: sha512sum keyweave-* | tee SHA512SUMS
-
- # - uses: softprops/action-gh-release@v1
- # env:
- # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- # with:
- # generate_release_notes: true
- # fail_on_unmatched_files: true
- # files: |
- # keyweave-*.tar.xz
- # *SUMS*
\ No newline at end of file
diff --git a/.github/workflows/target-tests.yml b/.github/workflows/release.yml
similarity index 54%
rename from .github/workflows/target-tests.yml
rename to .github/workflows/release.yml
index 14bd3ac..f72540d 100644
--- a/.github/workflows/target-tests.yml
+++ b/.github/workflows/release.yml
@@ -1,14 +1,10 @@
name: Release
on:
+ workflow_dispatch:
push:
- branches:
- - "feat/additional-build-targets"
- pull_request:
- branches:
- - "main"
- paths:
- - ".github/workflows/target-tests.yml"
+ tags:
+ - 'v[0-9]+.[0-9]+.[0-9]+'
jobs:
build:
@@ -94,7 +90,80 @@ jobs:
- uses: taiki-e/install-action@cross
if: ${{ matrix.cross }}
- - run: sudo apt-get install pkg-config libssl-dev
- if: startsWith(matrix.name, 'linux-')
-
- run: cargo build --release --locked
+
+ - name: Extract version
+ shell: bash
+ run: |
+ set -euxo pipefail
+
+ version=$(grep -m1 -F 'version =' Cargo.toml | cut -d\" -f2)
+
+ if [[ -z "$version" ]]; then
+ echo "Error: no version :("
+ exit 1
+ fi
+
+ echo "$version" > VERSION
+
+ - name: Package
+ shell: bash
+ run: |
+ set -euxo pipefail
+ ext=""
+ [[ "${{ matrix.name }}" == windows-* ]] && ext=".exe"
+ bin="target/${{ matrix.target }}/release/keyweave${ext}"
+ strip "$bin" || true
+ dst="keyweave-${{ matrix.target }}"
+ mkdir "$dst"
+ cp "$bin" "$dst/"
+
+ - name: Archive (tar)
+ if: '! startsWith(matrix.name, ''windows-'')'
+ shell: bash
+ run: |
+ set -euxo pipefail
+ dst="keyweave-${{ matrix.target }}"
+ tar cavf "$dst.tar.xz" "$dst"
+
+ - uses: actions/upload-artifact@v3
+ with:
+ name: builds
+ retention-days: 1
+ path: |
+ keyweave-*.tar.xz
+ keyweave-x86_64-pc-windows-gnu/keyweave.exe
+
+ sign:
+ needs: build
+
+ name: Checksum and sign
+ runs-on: ubuntu-latest
+ permissions:
+ id-token: write
+ contents: write
+
+ steps:
+ - uses: actions/checkout@v4
+ - uses: actions/cache@v3
+ with:
+ path: ~/.cargo/bin
+ key: sign-tools-${{ hashFiles('.github/workflows/release.yml') }}
+
+ - uses: actions/download-artifact@v3
+ with:
+ name: builds
+
+ - name: Checksums with SHA512
+ run: sha512sum keyweave-* | tee SHA512SUMS
+
+ - uses: softprops/action-gh-release@v1
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ with:
+ generate_release_notes: true
+ fail_on_unmatched_files: true
+ files: |
+ keyweave-*.tar.xz
+ keyweave-*/keyweave.exe
+ *SUMS*
\ No newline at end of file