clean up gha ci (#7)

* add ci feat * clean * clean * clean up gha ci
ysawa0 · Nov 7, 2023 · 00c1020 · 00c1020
1 parent dcfe669
commit 00c1020
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -20,6 +20,9 @@ jobs:
         with:
           python-version: "3.10"
 
+      - name: Set shfmt version environment variable
+        run: echo "SHFMT_VERSION=v3.7.0" >> $GITHUB_ENV
+
       - name: Cache pip dependencies
         uses: actions/cache@v3
         with:
@@ -32,18 +35,18 @@ jobs:
         uses: actions/cache@v3
         with:
           path: /usr/local/bin/shfmt
-          # key: ${{ runner.os }}-shfmt-${{ env.SHFMT_VERSION }}
-          key: ${{ runner.os }}-shfmt-
+          key: ${{ runner.os }}-shfmt-${{ env.SHFMT_VERSION }}
           restore-keys: |
+            ${{ runner.os }}-shfmt-${{ env.SHFMT_VERSION }}
             ${{ runner.os }}-shfmt-
 
       - name: Cache Pre-Commit environments
         uses: actions/cache@v3
         with:
           path: ~/.cache/pre-commit
-          # key: ${{ runner.os }}-pc-${{ hashFiles('.pre-commit-config.yaml') }}
-          key: ${{ runner.os }}-pc-
+          key: ${{ runner.os }}-pc-${{ hashFiles('.pre-commit-config.yaml') }}
           restore-keys: |
+            ${{ runner.os }}-pc-${{ hashFiles('.pre-commit-config.yaml') }}
             ${{ runner.os }}-pc-
 
       - name: Install dependencies
@@ -53,7 +56,7 @@ jobs:
 
       - name: Install shfmt
         run: |
-          SHFMT_VERSION="v3.7.0"
+          SHFMT_VERSION=${{ env.SHFMT_VERSION }}
           SHFMT_BIN="shfmt_${SHFMT_VERSION}_linux_amd64"
           if [[ ! -f /usr/local/bin/shfmt ]]; then
             wget -O shfmt "https://github.com/mvdan/sh/releases/download/${SHFMT_VERSION}/${SHFMT_BIN}"
@@ -81,8 +84,3 @@ jobs:
           else
             pre-commit run --from-ref origin/$DEFAULT_BRANCH --to-ref $CUR_SHA
           fi
-
-        # git fetch origin $DEFAULT_BRANCH
-        # LAST_SHA=$(git log --pretty=tformat:"%H" -n2 . | tail -n1)
-        # echo "Last SHA is $LAST_SHA"
-        # pre-commit run --from-ref $LAST_SHA --to-ref $CUR_SHA
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -45,8 +45,8 @@ jobs:
           path: |
             target
           key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}
-          # key: ${{ runner.os }}-cargo-
           restore-keys: |
+            ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}
             ${{ runner.os }}-cargo-
 
       - name: Build Release

diff --git a/example/.github/workflows/ci.yaml b/example/.github/workflows/ci.yaml
@@ -20,6 +20,9 @@ jobs:
         with:
           python-version: "3.10"
 
+      - name: Set shfmt version environment variable
+        run: echo "SHFMT_VERSION=v3.7.0" >> $GITHUB_ENV
+
       - name: Cache pip dependencies
         uses: actions/cache@v3
         with:
@@ -32,18 +35,18 @@ jobs:
         uses: actions/cache@v3
         with:
           path: /usr/local/bin/shfmt
-          # key: ${{ runner.os }}-shfmt-${{ env.SHFMT_VERSION }}
-          key: ${{ runner.os }}-shfmt-
+          key: ${{ runner.os }}-shfmt-${{ env.SHFMT_VERSION }}
           restore-keys: |
+            ${{ runner.os }}-shfmt-${{ env.SHFMT_VERSION }}
             ${{ runner.os }}-shfmt-
 
       - name: Cache Pre-Commit environments
         uses: actions/cache@v3
         with:
           path: ~/.cache/pre-commit
-          # key: ${{ runner.os }}-pc-${{ hashFiles('.pre-commit-config.yaml') }}
-          key: ${{ runner.os }}-pc-
+          key: ${{ runner.os }}-pc-${{ hashFiles('.pre-commit-config.yaml') }}
           restore-keys: |
+            ${{ runner.os }}-pc-${{ hashFiles('.pre-commit-config.yaml') }}
             ${{ runner.os }}-pc-
 
       - name: Install dependencies
@@ -53,7 +56,7 @@ jobs:
 
       - name: Install shfmt
         run: |
-          SHFMT_VERSION="v3.7.0"
+          SHFMT_VERSION=${{ env.SHFMT_VERSION }}
           SHFMT_BIN="shfmt_${SHFMT_VERSION}_linux_amd64"
           if [[ ! -f /usr/local/bin/shfmt ]]; then
             wget -O shfmt "https://github.com/mvdan/sh/releases/download/${SHFMT_VERSION}/${SHFMT_BIN}"