From 7a787c8eac0420b9ca29195d87ea9a23c6ff9bf3 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sun, 25 Feb 2024 17:04:39 +0900 Subject: [PATCH] Merge asdf and rtx CI files to make better naming scope --- .github/workflows/build.yml | 50 ++++++++++++++++++++++++++++- .github/workflows/mise.yml | 64 ------------------------------------- README.md | 2 +- 3 files changed, 50 insertions(+), 66 deletions(-) delete mode 100644 .github/workflows/mise.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1e206c5..6e0d8f6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ on: workflow_dispatch: jobs: - plugin-test: + asdf: timeout-minutes: 10 strategy: fail-fast: false @@ -52,3 +52,51 @@ jobs: with: version: ${{ matrix.target.tool-version }} command: ${{ matrix.target.command }} + + mise: + timeout-minutes: 10 + strategy: + fail-fast: false + matrix: + os: + - ubuntu-latest + - macos-13 # Intel + target: + - command: | + mise install cargo-make@latest + mise x cargo-make@latest -- makers --version + mise x cargo-make@latest -- cargo-make make --version + # Supported oldest + - command: | + mise install cargo-make@0.16.0 + # makers does not exist + mise x cargo-make@0.16.0 -- cargo-make make --version + include: + # They are releasing aarch64 binary since 0.36.7: https://github.com/sagiegurari/cargo-make/commit/ab3cac2261c0ba67ab6d7a277aff8252faec0b1c + - os: macos-14 # M1 + target: + command: | + mise install cargo-make@latest + mise x cargo-make@latest -- makers --version + mise x cargo-make@latest -- cargo-make make --version + - os: macos-14 # M1 + target: + command: | + mise install cargo-make@0.36.7 + mise x cargo-make@latest -- makers --version + mise x cargo-make@latest -- cargo-make make --version + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v4 + - uses: jdx/mise-action@v2 + with: + tool_versions: | + # - This comment should have different value for each run to avoid the cache. See #75 and #77 + # - avoid-cache-key: ${{ github.ref }}-${{ github.run_id }}-${{ github.run_attempt }} + # - Don't set cargo-make versions here. Keep no tools for clean room test + - name: Install plugin + run: | + mise plugins install cargo-make https://github.com/kachick/asdf-cargo-make.git#${{ github.ref }} + - name: Test + run: | + ${{ matrix.target.command }} diff --git a/.github/workflows/mise.yml b/.github/workflows/mise.yml deleted file mode 100644 index 1891d1d..0000000 --- a/.github/workflows/mise.yml +++ /dev/null @@ -1,64 +0,0 @@ -name: mise -on: - push: - branches: - - main - paths-ignore: - - '**.md' - pull_request: - paths-ignore: - - '**.md' - schedule: - # Every 10:42 JST - # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule - - cron: '42 1 * * *' - workflow_dispatch: - -jobs: - plugin-test: - timeout-minutes: 10 - strategy: - fail-fast: false - matrix: - os: - - ubuntu-latest - - macos-13 # Intel - target: - - command: | - mise install cargo-make@latest - mise x cargo-make@latest -- makers --version - mise x cargo-make@latest -- cargo-make make --version - # Supported oldest - - command: | - mise install cargo-make@0.16.0 - # makers does not exist - mise x cargo-make@0.16.0 -- cargo-make make --version - include: - # They are releasing aarch64 binary since 0.36.7: https://github.com/sagiegurari/cargo-make/commit/ab3cac2261c0ba67ab6d7a277aff8252faec0b1c - - os: macos-14 # M1 - target: - command: | - mise install cargo-make@latest - mise x cargo-make@latest -- makers --version - mise x cargo-make@latest -- cargo-make make --version - - os: macos-14 # M1 - target: - command: | - mise install cargo-make@0.36.7 - mise x cargo-make@latest -- makers --version - mise x cargo-make@latest -- cargo-make make --version - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v4 - - uses: jdx/mise-action@v2 - with: - tool_versions: | - # - This comment should have different value for each run to avoid the cache. See #75 and #77 - # - avoid-cache-key: ${{ github.ref }}-${{ github.run_id }}-${{ github.run_attempt }} - # - Don't set cargo-make versions here. Keep no tools for clean room test - - name: Install plugin - run: | - mise plugins install cargo-make https://github.com/kachick/asdf-cargo-make.git#${{ github.ref }} - - name: Test - run: | - ${{ matrix.target.command }} diff --git a/README.md b/README.md index 77e36bd..9a07b98 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # asdf-cargo-make -[![Build](https://github.com/kachick/asdf-cargo-make/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/kachick/asdf-cargo-make/actions/workflows/build.yml?query=branch%3Amain) [![Lint](https://github.com/kachick/asdf-cargo-make/actions/workflows/lint.yml/badge.svg?branch=main)](https://github.com/kachick/asdf-cargo-make/actions/workflows/lint.yml?query=branch%3Amain) [![mise](https://github.com/kachick/asdf-cargo-make/actions/workflows/mise.yml/badge.svg?branch=main)](https://github.com/kachick/asdf-cargo-make/actions/workflows/mise.yml?query=branch%3Amain) +[![Build](https://github.com/kachick/asdf-cargo-make/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/kachick/asdf-cargo-make/actions/workflows/build.yml?query=branch%3Amain) [![Lint](https://github.com/kachick/asdf-cargo-make/actions/workflows/lint.yml/badge.svg?branch=main)](https://github.com/kachick/asdf-cargo-make/actions/workflows/lint.yml?query=branch%3Amain) [cargo-make](https://sagiegurari.github.io/cargo-make/) plugin for the [asdf version manager](https://asdf-vm.com).\ Tested also [mise](https://github.com/jdx/mise).