diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d35e32f93..15f8ea326 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,7 +32,7 @@ jobs: runner: "ubuntu-latest" stack-yaml: "stack.ghc-8.10.yaml" fail-fast: false - name: ${{ matrix.os.runner }} - ${{runner.arch}} - ${{ matrix.stack-yaml }} + name: ${{ matrix.os.runner }} - ${{matrix.os.runner.arch}} - ${{ matrix.stack-yaml }} runs-on: ${{ matrix.os.runner }} steps: - name: "Checkout repository" @@ -48,9 +48,9 @@ jobs: - name: "Cache" uses: actions/cache@v3 with: - key: ${{ matrix.os.runner }}-${{runner.arch}}-${{ hashFiles(matrix.stack-yaml) }}-${{ env.cache_generation }} + key: ${{ matrix.os.runner }}-${{matrix.os.runner.arch}}-${{ hashFiles(matrix.stack-yaml) }}-${{ env.cache_generation }} restore-keys: | - ${{ matrix.os.runner }}-${{runner.arch}}- + ${{ matrix.os.runner }}-${{matrix.os.runner.arch}}- path: | ${{ steps.setup-haskell-cabal.outputs.stack-root }} - name: Install libsodium diff --git a/.mergify.yml b/.mergify.yml index 3995d681f..1092588cc 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -4,7 +4,7 @@ queue_rules: - check-success=hydra # Mergify explicitly recommends listing each status check separately: # https://docs.mergify.io/conditions/#validating-all-status-checks - - check-success=macOS-latest - stack.yaml + - check-success=macOS-latest - - stack.yaml - check-success=ubuntu-latest - stack.yaml - check-success=windows-latest - stack.yaml pull_request_rules: