From f3305189f107cd91d428bff34711d779927aa182 Mon Sep 17 00:00:00 2001
From: Jacek Sieka <jacek@status.im>
Date: Fri, 9 Dec 2022 17:06:29 +0100
Subject: [PATCH] bump & ci fixes (#4409)

---
 .github/workflows/ci.yml | 38 ++++++++++++--------------------------
 vendor/nim-http-utils    |  2 +-
 vendor/nim-json-rpc      |  2 +-
 vendor/nim-presto        |  2 +-
 4 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4a62e9088..db081c08f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,6 +10,10 @@ on:
     paths-ignore: ['media/**', 'docs/**', '**/*.md']
   workflow_dispatch:
 
+concurrency: # Cancel stale PR builds (but not push builds)
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
 jobs:
   build:
     strategy:
@@ -44,29 +48,11 @@ jobs:
     name: '${{ matrix.target.os }}-${{ matrix.target.cpu }} (Nim ${{ matrix.branch }})'
     runs-on: ${{ matrix.builder }}
     steps:
-      - name: Get branch name
-        shell: bash
-        run: |
-          if [[ '${{  github.event_name }}' == 'pull_request' ]]; then
-            echo "##[set-output name=branch_name;]$(echo ${GITHUB_HEAD_REF})"
-            echo "Branch found (PR): ${GITHUB_HEAD_REF}"
-          else
-            echo "##[set-output name=branch_name;]$(echo ${GITHUB_REF#refs/heads/})"
-            echo "Branch found (not PR): ${GITHUB_REF#refs/heads/}"
-          fi
-        id: get_branch
-
-      - name: Cancel Previous Runs (except main branches)
-        if: >
-          steps.get_branch.outputs.branch_name != 'stable' &&
-          steps.get_branch.outputs.branch_name != 'unstable' &&
-          steps.get_branch.outputs.branch_name != 'testing'
-        uses: styfle/cancel-workflow-action@0.9.1
-        with:
-          access_token: ${{ github.token }}
-
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+        # Fails on nimyaml tests:
+        # with:
+        #  submodules: true
 
       - name: MSYS2 (Windows amd64)
         if: runner.os == 'Windows' && matrix.target.cpu == 'amd64'
@@ -84,7 +70,7 @@ jobs:
         id: windows-dlls-cache
         uses: actions/cache@v2
         with:
-          path: external/dlls
+          path: external/dlls-${{ matrix.target.cpu }}
           key: 'dlls-${{ matrix.target.cpu }}'
 
       - name: Install DLLs dependencies (Windows)
@@ -94,13 +80,13 @@ jobs:
         run: |
           mkdir -p external
           curl -L "https://nim-lang.org/download/windeps.zip" -o external/windeps.zip
-          7z x -y external/windeps.zip -oexternal/dlls
+          7z x -y external/windeps.zip -oexternal/dlls-${{ matrix.target.cpu }}
 
       - name: Path to cached dependencies (Windows)
         if: >
           runner.os == 'Windows'
         run: |
-          echo "${{ github.workspace }}/external/dlls" >> $GITHUB_PATH
+          echo "${{ github.workspace }}/external/dlls-${{ matrix.target.cpu }}" >> $GITHUB_PATH
           # for miniupnp that runs "wingenminiupnpcstrings.exe" from the current dir
           echo "." >> $GITHUB_PATH
 
@@ -117,7 +103,7 @@ jobs:
           else
             PLATFORM=x86
           fi
-          echo "PLATFORM=${PLATFORM}" >> $GITHUB_ENV
+          echo "PLATFORM=$PLATFORM" >> $GITHUB_ENV
 
           # Stack usage test on recent enough gcc:
           if [[ '${{ runner.os }}' == 'Linux' && '${{ matrix.target.cpu }}' == 'amd64' ]]; then
diff --git a/vendor/nim-http-utils b/vendor/nim-http-utils
index e88e231df..a85bd52ae 160000
--- a/vendor/nim-http-utils
+++ b/vendor/nim-http-utils
@@ -1 +1 @@
-Subproject commit e88e231dfcef4585fe3b2fbd9b664dbd28a88040
+Subproject commit a85bd52ae0a956983ca6b3267c72961d2ec0245f
diff --git a/vendor/nim-json-rpc b/vendor/nim-json-rpc
index b4aff8fec..c0ecb4261 160000
--- a/vendor/nim-json-rpc
+++ b/vendor/nim-json-rpc
@@ -1 +1 @@
-Subproject commit b4aff8fec55195d035188210f85ae540b600a777
+Subproject commit c0ecb426131ebc2c3d11c085d749f55884f6fea6
diff --git a/vendor/nim-presto b/vendor/nim-presto
index 8bc34dd6f..a6c32794b 160000
--- a/vendor/nim-presto
+++ b/vendor/nim-presto
@@ -1 +1 @@
-Subproject commit 8bc34dd6f60b6bfe22049323100355671e4137a2
+Subproject commit a6c32794bf9ac04989764f2b5242fb76e4232c9c