Merge branch 'status-im:master' into master

.github/workflows/ci.yml

@@ -22,23 +22,29 @@ jobs:
             cpu: i386
           - os: macos
             cpu: amd64
+          - os: macos
+            cpu: arm64
           - os: windows
             cpu: amd64
-          #- os: windows
-            #cpu: i386
-        branch: [version-1-2, version-1-4, version-1-6, devel]
+        branch: [version-1-6, version-2-0, devel]
         include:
           - target:
               os: linux
-            builder: ubuntu-20.04
+            builder: ubuntu-latest
+            shell: bash
+          - target:
+              os: macos
+              cpu: amd64
+            builder: macos-13
             shell: bash
           - target:
               os: macos
-            builder: macos-11
+              cpu: arm64
+            builder: macos-latest
             shell: bash
           - target:
               os: windows
-            builder: windows-2019
+            builder: windows-latest
             shell: msys2 {0}
 
     defaults:
@@ -50,7 +56,13 @@ jobs:
     continue-on-error: ${{ matrix.branch == 'devel' }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
+      - name: Enable debug verbosity
+        if: runner.debug == '1'
+        run: |
+          echo "V=1" >> $GITHUB_ENV
+          echo "UNITTEST2_OUTPUT_LVL=VERBOSE" >> $GITHUB_ENV
 
       - name: Install build dependencies (Linux i386)
         if: runner.os == 'Linux' && matrix.target.cpu == 'i386'
@@ -96,7 +108,7 @@ jobs:
       - name: Restore Nim DLLs dependencies (Windows) from cache
         if: runner.os == 'Windows'
         id: windows-dlls-cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: external/dlls-${{ matrix.target.cpu }}
           key: 'dlls-${{ matrix.target.cpu }}'
@@ -120,6 +132,8 @@ jobs:
         run: |
           if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then
             PLATFORM=x64
+          elif [[ '${{ matrix.target.cpu }}' == 'arm64' ]]; then
+            PLATFORM=arm64
           else
             PLATFORM=x86
           fi
@@ -159,3 +173,4 @@ jobs:
           nimble install -y libbacktrace
           nimble test
           nimble test_libbacktrace
+          nimble examples

.github/workflows/doc.yml

@@ -15,48 +15,44 @@ jobs:
     continue-on-error: true
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           submodules: true
+      - uses: actions-rs/[email protected]
+        with:
+          crate: mdbook
+          use-tool-cache: true
+          version: "0.4.36"
+      - uses: actions-rs/[email protected]
+        with:
+          crate: mdbook-toc
+          use-tool-cache: true
+          version: "0.14.1"
+      - uses: actions-rs/[email protected]
+        with:
+          crate: mdbook-open-on-gh
+          use-tool-cache: true
+          version: "2.4.1"
+      - uses: actions-rs/[email protected]
+        with:
+          crate: mdbook-admonish
+          use-tool-cache: true
+          version: "1.14.0"
 
       - uses: jiro4989/setup-nim-action@v1
         with:
-          nim-version: '1.6.6'
+          nim-version: '1.6.20'
 
       - name: Generate doc
         run: |
           nim --version
           nimble --version
           nimble install -dy
-          # nim doc can "fail", but the doc is still generated
-          nim doc --git.url:https://github.com/status-im/nim-chronos --git.commit:master --outdir:docs --project chronos || true
-
-          # check that the folder exists
-          ls docs
+          nimble docs || true
 
-      - name: Clone the gh-pages branch
-        uses: actions/checkout@v2
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v3
         with:
-          repository: status-im/nim-chronos
-          ref: gh-pages
-          path: subdoc
-          submodules: true
-          fetch-depth: 0
-
-      - name: Commit & push
-        run: |
-          cd subdoc
-
-          # Update / create this branch doc
-          rm -rf docs
-          mv ../docs .
-
-          # Remove .idx files
-          # NOTE: git also uses idx files in his
-          # internal folder, hence the `*` instead of `.`
-          find * -name "*.idx" -delete
-          git add .
-          git config --global user.email "${{ github.actor }}@users.noreply.github.com"
-          git config --global user.name = "${{ github.actor }}"
-          git commit -a -m "update docs"
-          git push origin gh-pages
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./docs/book
+          force_orphan: true

.gitignore

@@ -3,3 +3,4 @@ nimcache/
 nimble.develop
 nimble.paths
 /build/
+nimbledeps