From 8fd2077b9df6f2293ecb532bb7672559f2e4919e Mon Sep 17 00:00:00 2001 From: David McGillicuddy Date: Sat, 4 May 2024 17:51:04 +0100 Subject: [PATCH] update workflow deps 1 --- .circleci/config.yml | 8 -------- .github/workflows/ci.yaml | 16 +++++----------- .github/workflows/release.yml | 28 +++++++++++----------------- 3 files changed, 16 insertions(+), 36 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 0b38c7b..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,8 +0,0 @@ -version: 2 -jobs: - build: - docker: - - image: rust:1.75 - steps: - - checkout - - run: cargo test diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fa2682c..f8598d3 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,6 +1,6 @@ on: push: - branches: [ staging, trying, main ] + branches: [ staging, trying, main, workflow-test ] pull_request: name: CI @@ -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 }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 63bb90f..c9030a6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: release on: push: branches: - - main + - workflow-test tags: - v*.*.* workflow_dispatch: @@ -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' }} @@ -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 }} @@ -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 @@ -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) }}