From 52bc629bdf7b6552ab6339ec3c3d141626bdbf49 Mon Sep 17 00:00:00 2001 From: Evan Sims Date: Mon, 8 Jan 2024 20:45:35 -0600 Subject: [PATCH 1/2] Fixing linter test --- .github/workflows/tests.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 18cfb379..50519eb1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -35,7 +35,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ github.event.pull_request.merge_commit_sha || github.ref }} + ref: ${{ github.shaa || github.ref }} - id: set-matrix run: echo "matrix=$(jq -c . < ./.github/workflows/matrix.json)" >> $GITHUB_OUTPUT @@ -52,7 +52,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ github.event.pull_request.merge_commit_sha || github.ref }} + ref: ${{ github.shaa || github.ref }} - uses: ./.github/actions/setup with: @@ -70,7 +70,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ github.event.pull_request.merge_commit_sha || github.ref }} + ref: ${{ github.shaa || github.ref }} - uses: ./.github/actions/setup with: @@ -97,7 +97,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ github.event.pull_request.merge_commit_sha || github.ref }} + ref: ${{ github.shaa || github.ref }} - uses: ./.github/actions/setup with: @@ -117,7 +117,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ github.event.pull_request.merge_commit_sha || github.ref }} + ref: ${{ github.shaa || github.ref }} - uses: ./.github/actions/setup with: @@ -133,7 +133,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ github.event.pull_request.merge_commit_sha || github.ref }} + ref: ${{ github.shaa || github.ref }} - uses: ./.github/actions/setup with: @@ -149,7 +149,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ github.event.pull_request.merge_commit_sha || github.ref }} + ref: ${{ github.shaa || github.ref }} - uses: ./.github/actions/setup with: @@ -165,7 +165,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ github.event.pull_request.merge_commit_sha || github.ref }} + ref: ${{ github.shaa || github.ref }} - uses: ./.github/actions/setup with: @@ -181,7 +181,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ github.event.pull_request.merge_commit_sha || github.ref }} + ref: ${{ github.shaa || github.ref }} - uses: ./.github/actions/setup with: From 375eb986a9227cf33a923e30ea980bea62bdb2d3 Mon Sep 17 00:00:00 2001 From: Evan Sims Date: Mon, 8 Jan 2024 20:46:02 -0600 Subject: [PATCH 2/2] Fixing linter test --- .github/workflows/tests.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 50519eb1..cc56d27a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -35,7 +35,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ github.shaa || github.ref }} + ref: ${{ github.sha || github.ref }} - id: set-matrix run: echo "matrix=$(jq -c . < ./.github/workflows/matrix.json)" >> $GITHUB_OUTPUT @@ -52,7 +52,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ github.shaa || github.ref }} + ref: ${{ github.sha || github.ref }} - uses: ./.github/actions/setup with: @@ -70,7 +70,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ github.shaa || github.ref }} + ref: ${{ github.sha || github.ref }} - uses: ./.github/actions/setup with: @@ -97,7 +97,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ github.shaa || github.ref }} + ref: ${{ github.sha || github.ref }} - uses: ./.github/actions/setup with: @@ -117,7 +117,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ github.shaa || github.ref }} + ref: ${{ github.sha || github.ref }} - uses: ./.github/actions/setup with: @@ -133,7 +133,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ github.shaa || github.ref }} + ref: ${{ github.sha || github.ref }} - uses: ./.github/actions/setup with: @@ -149,7 +149,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ github.shaa || github.ref }} + ref: ${{ github.sha || github.ref }} - uses: ./.github/actions/setup with: @@ -165,7 +165,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ github.shaa || github.ref }} + ref: ${{ github.sha || github.ref }} - uses: ./.github/actions/setup with: @@ -181,7 +181,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ github.shaa || github.ref }} + ref: ${{ github.sha || github.ref }} - uses: ./.github/actions/setup with: