From 8c5b0405846554480966ac8edf16a6ad7c51716c Mon Sep 17 00:00:00 2001 From: Tanimura Yoshinori Date: Thu, 13 Mar 2025 21:09:29 +0900 Subject: [PATCH 1/2] add .env --- .github/workflows/.env | 2 ++ .github/workflows/changelog.yml | 2 +- .github/workflows/esprc.yml | 8 ++++---- .github/workflows/gh-pages.yml | 4 ++-- .github/workflows/rust.yml | 16 ++++++++-------- CHANGELOG.md | 5 +++++ 6 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 .github/workflows/.env diff --git a/.github/workflows/.env b/.github/workflows/.env new file mode 100644 index 00000000..1c834f50 --- /dev/null +++ b/.github/workflows/.env @@ -0,0 +1,2 @@ +MSRV=1.75.0 +UBUNTU_VERSION=ubuntu-22.04 diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 04737aa8..3e35e5f1 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -5,7 +5,7 @@ on: jobs: test: - runs-on: ${{ vars.UBUNTU_VERSION }} + runs-on: ${{ env.UBUNTU_VERSION }} steps: - uses: actions/checkout@v1 with: diff --git a/.github/workflows/esprc.yml b/.github/workflows/esprc.yml index 0d18749e..cf069d59 100644 --- a/.github/workflows/esprc.yml +++ b/.github/workflows/esprc.yml @@ -8,7 +8,7 @@ on: jobs: parse: - runs-on: ${{ vars.UBUNTU_VERSION }} + runs-on: ${{ env.UBUNTU_VERSION }} strategy: matrix: ap: @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v1 - uses: actions-rs/toolchain@v1 with: - toolchain: ${{ vars.MSRV }} + toolchain: ${{ env.MSRV }} profile: minimal default: true override: true @@ -28,7 +28,7 @@ jobs: args: --release --bin esprc -- ./schemas/APs/10303-${{ matrix.ap }}-aim-long.exp --check generate: - runs-on: ${{ vars.UBUNTU_VERSION }} + runs-on: ${{ env.UBUNTU_VERSION }} strategy: matrix: ap: @@ -38,7 +38,7 @@ jobs: - uses: actions/checkout@v1 - uses: actions-rs/toolchain@v1 with: - toolchain: ${{ vars.MSRV }} + toolchain: ${{ env.MSRV }} profile: minimal components: rustfmt default: true diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index afce9694..5685b0fa 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -7,12 +7,12 @@ on: jobs: pages: - runs-on: ${{ vars.UBUNTU_VERSION }} + runs-on: ${{ env.UBUNTU_VERSION }} steps: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 with: - toolchain: ${{ vars.MSRV }} + toolchain: ${{ env.MSRV }} profile: minimal default: true override: true diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 6962fe99..dc1cc5d1 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -8,12 +8,12 @@ on: jobs: test: - runs-on: ${{ vars.UBUNTU_VERSION }} + runs-on: ${{ env.UBUNTU_VERSION }} strategy: matrix: rust: - stable - - ${{ vars.MSRV }} + - ${{ env.MSRV }} steps: - uses: actions/checkout@v1 - uses: actions-rs/toolchain@v1 @@ -30,12 +30,12 @@ jobs: args: --all-features check-format: - runs-on: ${{ vars.UBUNTU_VERSION }} + runs-on: ${{ env.UBUNTU_VERSION }} steps: - uses: actions/checkout@v1 - uses: actions-rs/toolchain@v1 with: - toolchain: ${{ vars.MSRV }} + toolchain: ${{ env.MSRV }} profile: minimal components: rustfmt default: true @@ -46,12 +46,12 @@ jobs: args: -- --check doc: - runs-on: ${{ vars.UBUNTU_VERSION }} + runs-on: ${{ env.UBUNTU_VERSION }} steps: - uses: actions/checkout@v1 - uses: actions-rs/toolchain@v1 with: - toolchain: ${{ vars.MSRV }} + toolchain: ${{ env.MSRV }} profile: minimal default: true override: true @@ -61,12 +61,12 @@ jobs: args: --no-deps clippy: - runs-on: ${{ vars.UBUNTU_VERSION }} + runs-on: ${{ env.UBUNTU_VERSION }} steps: - uses: actions/checkout@v1 - uses: actions-rs/toolchain@v1 with: - toolchain: ${{ vars.MSRV }} + toolchain: ${{ env.MSRV }} profile: minimal components: clippy default: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 50a3f6b4..d2c85aee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,11 @@ In addition to original Keep-a-Changelog, we use following rules: - This will be checked by GitHub Actions - Each Pull Request MAY correspond to one or more lines in this file +## Unreleased + +### Internal +- Using `.env` variables for Actions. + ## 0.4.0 - 2024-09-20 ### Added From 70315a2a0fbea78f9d27ef95a043b482b8b99d9d Mon Sep 17 00:00:00 2001 From: Tanimura Yoshinori Date: Thu, 13 Mar 2025 21:27:43 +0900 Subject: [PATCH 2/2] Update actions/checkout --- .github/workflows/changelog.yml | 2 +- .github/workflows/esprc.yml | 4 ++-- .github/workflows/gh-pages.yml | 2 +- .github/workflows/rust.yml | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 3e35e5f1..99731a39 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -7,7 +7,7 @@ jobs: test: runs-on: ${{ env.UBUNTU_VERSION }} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 with: fetch-depth: 0 - run: bash -c "! git diff --exit-code origin/master... CHANGELOG.md" diff --git a/.github/workflows/esprc.yml b/.github/workflows/esprc.yml index cf069d59..bfa69ad2 100644 --- a/.github/workflows/esprc.yml +++ b/.github/workflows/esprc.yml @@ -15,7 +15,7 @@ jobs: - "201" - "203" steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: toolchain: ${{ env.MSRV }} @@ -35,7 +35,7 @@ jobs: - "201" - "203" steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: toolchain: ${{ env.MSRV }} diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 5685b0fa..c3bdf631 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -9,7 +9,7 @@ jobs: pages: runs-on: ${{ env.UBUNTU_VERSION }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: toolchain: ${{ env.MSRV }} diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index dc1cc5d1..c59ff9e4 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -15,7 +15,7 @@ jobs: - stable - ${{ env.MSRV }} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: profile: minimal @@ -32,7 +32,7 @@ jobs: check-format: runs-on: ${{ env.UBUNTU_VERSION }} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: toolchain: ${{ env.MSRV }} @@ -48,7 +48,7 @@ jobs: doc: runs-on: ${{ env.UBUNTU_VERSION }} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: toolchain: ${{ env.MSRV }} @@ -63,7 +63,7 @@ jobs: clippy: runs-on: ${{ env.UBUNTU_VERSION }} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: toolchain: ${{ env.MSRV }}