Merge branch 'main' into dev

This commit is contained in:
Jack Wills
2022-09-07 11:27:55 -04:00
@@ -9,6 +9,13 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
# Publish to crates.io
- name: publish to crates.io
uses: katyo/publish-crates@v1
with:
registry-token: ${{ secrets.CRATES_IO_TOKEN }}
# Build for linux x86_64 # Build for linux x86_64
- name: build release linux_x86_64 - name: build release linux_x86_64
@@ -20,7 +27,7 @@ jobs:
run: tar -C target/release -czf ./oxker_linux_x86_64.tar.gz oxker run: tar -C target/release -czf ./oxker_linux_x86_64.tar.gz oxker
# Build for linux aarch64, aka 64 bit pi 4 # Build for linux aarch64, aka 64 bit pi 4
- name: build release armv7 - name: build release arm64v8
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
with: with:
toolchain: stable toolchain: stable
@@ -82,12 +89,6 @@ jobs:
--push \ --push \
-f containerised/Dockerfile . -f containerised/Dockerfile .
# Publish to crates.io
- name: publish to crates.io
uses: katyo/publish-crates@v1
with:
registry-token: ${{ secrets.CRATES_IO_TOKEN }}
- name: Release - name: Release
uses: softprops/action-gh-release@v1 uses: softprops/action-gh-release@v1
with: with:
@@ -101,4 +102,4 @@ jobs:
oxker_linux_armv6.tar.gz oxker_linux_armv6.tar.gz
oxker_windows_x86_64.zip oxker_windows_x86_64.zip
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}