Skip to content

Commit

Permalink
update workflow deps 1
Browse files Browse the repository at this point in the history
  • Loading branch information
djmcgill committed May 4, 2024
1 parent 67779cd commit 8fd2077
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 36 deletions.
8 changes: 0 additions & 8 deletions .circleci/config.yml

This file was deleted.

16 changes: 5 additions & 11 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
on:
push:
branches: [ staging, trying, main ]
branches: [ staging, trying, main, workflow-test ]
pull_request:

name: CI
Expand All @@ -14,21 +14,15 @@ jobs:
TARGET: [x86_64-unknown-linux-gnu, x86_64-pc-windows-msvc]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions-rs/toolchain@v1
- uses: dtolnay/rust-toolchain@stable
with:
profile: minimal
toolchain: stable
override: true
target: ${{ matrix.TARGET }}
targets: ${{ matrix.TARGET }}

- name: Cache Dependencies
uses: Swatinem/rust-cache@v2
with:
key: ${{ matrix.TARGET }}

- uses: actions-rs/cargo@v1
with:
command: check
args: --target ${{ matrix.TARGET }}
- run: cargo check --target ${{ matrix.TARGET }}
28 changes: 11 additions & 17 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: release
on:
push:
branches:
- main
- workflow-test
tags:
- v*.*.*
workflow_dispatch:
Expand All @@ -12,26 +12,20 @@ jobs:
strategy:
matrix:
include:
- { target: x86_64-unknown-linux-gnu, os: ubuntu-20.04, suffix: .gz }
- { target: x86_64-unknown-linux-gnu, os: ubuntu-latest, suffix: .gz }
- { target: x86_64-apple-darwin, os: macos-latest, suffix: .gz }
- { target: x86_64-pc-windows-msvc, os: windows-latest, suffix: .zip }
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
profile: minimal
target: ${{ matrix.target }}
override: true
targets: ${{ matrix.target }}
- name: Cache Dependencies
uses: Swatinem/rust-cache@v2
with:
key: ${{ matrix.target }}
- uses: actions-rs/cargo@v1
with:
command: build
args: --target ${{ matrix.target }} --release
- run: cargo build --target ${{ matrix.target }} --release

- name: (Not Windows) Move executables and compress
if: ${{ matrix.os != 'windows-latest' }}
Expand All @@ -41,7 +35,7 @@ jobs:
if: ${{ matrix.os == 'windows-latest' }}
run: Compress-Archive -Path target\${{ matrix.target }}\release\form.exe -DestinationPath form-${{ matrix.target }}${{ matrix.suffix }}

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: form-${{ matrix.target }}
path: form-${{ matrix.target }}${{ matrix.suffix }}
Expand All @@ -53,8 +47,8 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/checkout@v3
- uses: actions/download-artifact@v3
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
path: artifacts
- run: ls -R ./artifacts
Expand All @@ -63,11 +57,11 @@ jobs:
run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV

- id: changelog-reader
uses: mindsers/changelog-reader-action@v2.0.0
uses: mindsers/changelog-reader-action@v2
with:
version: ${{ (github.ref_type == 'tag' && github.ref_name) || 'Unreleased' }}

- uses: softprops/action-gh-release@v1
- uses: softprops/action-gh-release@v2
with:
tag_name: ${{ steps.changelog-reader.outputs.version }}
name: ${{ (github.ref_type == 'tag' && steps.changelog-reader.outputs.version) || format('Prereleased {0}', env.CURRENT_DATE) }}
Expand Down

0 comments on commit 8fd2077

Please sign in to comment.