Merge branch 'master' into rust-gcoap-add-saul

Makefile.ci was completely removed, pending regeneration

.cargo/config.toml

@@ -0,0 +1,9 @@
+# Between RIOT releases, this file points all projects in the tree to git
+# versions (still respecting Cargo.lock).
+#
+# Authors of out-of-tree applications can use the same lines in their
+# Cargo.toml, copy this file over, or just use the released versions.
+
+[patch.crates-io]
+riot-sys = { git = "https://github.com/RIOT-OS/rust-riot-sys" }
+riot-wrappers = { git = "https://github.com/RIOT-OS/rust-riot-wrappers" }

.github/ISSUE_TEMPLATE/bug_report.md

@@ -38,7 +38,7 @@ Please paste or specifically describe the actual output.
 
 #### Versions
 <!--
-Operating system: Mac OSX, Linux, Vagrant VM
+Operating system: macOS, Linux, Vagrant VM
 Build environment: GCC, CLang versions (you can run the following command from
 the RIOT base directory: make print-versions).
 -->

.github/labeler.yml

@@ -17,9 +17,10 @@
   - "**/*.mk"
 
 "Area: CI":
-  - ".circleci/**/*"
   - ".github/**/*.yml"
   - ".murdock"
+  - ".murdock.yml"
+  - "bors.toml"
 
 "Area: CoAP":
   - "sys/net/application_layer/*coap/**/*"
@@ -117,7 +118,9 @@
 
 "Platform: native":
   - "boards/native/**/*"
+  - "boards/native64/**/*"
   - "cpu/native/**/*"
+  - "makefiles/arch/native.inc.mk"
 
 "Platform: ARM":
   - "cpu/arm7_common/**/*"
@@ -142,10 +145,6 @@
 "Platform: ESP":
   - "cpu/esp*/**/*"
 
-"Platform: MIPS":
-  - "cpu/mips*/**/*"
-  - "makefiles/arch/mips.inc.mk"
-
 "Platform: MSP":
   - "cpu/msp*/**/*"
   - "makefiles/arch/msp430.inc.mk"

.github/workflows/check-commits.yml

@@ -0,0 +1,37 @@
+name: check-commits
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+  merge_group:
+
+jobs:
+  check-commits:
+    runs-on: ubuntu-latest
+    if: ${{ github.base_ref }}
+    strategy:
+      fail-fast: false
+      matrix:
+        check: [commit-msg, pr_check]
+    steps:
+    - uses: actions/checkout@main
+      with:
+        # Use the SHA of the PR branch as-is, not the PR branch merged
+        # in master (default behavior in GH actions)
+        # See https://github.com/actions/checkout#checkout-pull-request-head-commit-instead-of-merge-commit
+        ref: ${{ github.event.pull_request.head.sha }}
+        fetch-depth: 0
+    - name: Fetch base branch
+      run:
+        git fetch origin '${{ github.base_ref }}:${{ github.base_ref }}'
+    - name: Run checks
+      run: |
+        ./dist/tools/${{ matrix.check }}/check.sh "${{ github.base_ref }}"
+  check-commits-success:
+    needs: check-commits
+    if: always() && github.event_name != 'merge_group'
+    runs-on: ubuntu-latest
+    steps:
+    - name: check-commits succeeded
+      uses: re-actors/alls-green@release/v1
+      with:
+        jobs: ${{ toJSON(needs) }}

.github/workflows/check-labels.yml

@@ -0,0 +1,20 @@
+name: check-labels
+on:
+  pull_request_target:
+    types: [opened, reopened, labeled, unlabeled, synchronize]
+  pull_request_review:
+    types: [submitted, dismissed]
+  merge_group:
+
+jobs:
+  check-labels:
+    if: github.event_name != 'merge_group'
+    runs-on: ubuntu-latest
+    steps:
+    - uses: RIOT-OS/check-labels-action@v1.1.1
+      with:
+        access_token: ${{ secrets.GITHUB_TOKEN }}
+        unset_labels: 'CI: needs squashing,State: waiting for CI update,State: waiting for other PR,Process: blocked by feature freeze'
+        cond_labels: '(Process: needs >1 ACK,review.approvals>1),(Area: RDM,review.approvals>2)'
+        missing_approvals_label: 'Process: missing approvals'
+        pull_request: ${{ github.event.pull_request.number }}

.github/workflows/labeler.yml

@@ -3,12 +3,14 @@ name: pr-labeler
 on:
   pull_request_target:
     types: [opened, synchronize, reopened]
+  merge_group:
 
 jobs:
   triage:
     runs-on: ubuntu-latest
+    if: github.event_name != 'merge_group'
     steps:
-    - uses: actions/labeler@main
+    - uses: actions/labeler@v4
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
         sync-labels: true

.github/workflows/release-test.yml

@@ -44,7 +44,7 @@ env:
 # to hit Github Limit of 6h per job.
 jobs:
   tasks:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     timeout-minutes: 360
     strategy:
       fail-fast: false
@@ -78,20 +78,28 @@ jobs:
         ssh -oStrictHostKeyChecking=accept-new \
           ${IOTLAB_USER}@saclay.iot-lab.info exit
     - name: Fetch host key from IoT-LAB lille site
+      # Not being used in the most recent release specs but kept in for
+      # backwords compatibility
       if: ${{ matrix.pytest_mark == 'iotlab_creds' }}
       run: |
         IOTLAB_USER=$(cat ~/.iotlabrc | cut -f1 -d:)
         ssh -oStrictHostKeyChecking=accept-new \
           ${IOTLAB_USER}@lille.iot-lab.info exit
+    - name: Fetch host key from IoT-LAB strasbourg site
+      if: ${{ matrix.pytest_mark == 'iotlab_creds' }}
+      run: |
+        IOTLAB_USER=$(cat ~/.iotlabrc | cut -f1 -d:)
+        ssh -oStrictHostKeyChecking=accept-new \
+          ${IOTLAB_USER}@strasbourg.iot-lab.info exit
     - name: Checkout Release-Specs
-      uses: actions/checkout@v2
+      uses: actions/checkout@main
       with:
         repository: RIOT-OS/Release-Specs
         path: Release-Specs
         fetch-depth: 1
         ref: ${{ github.event.inputs.release_specs_version }}
     - name: Checkout RIOT
-      uses: actions/checkout@v2
+      uses: actions/checkout@main
       with:
         repository: RIOT-OS/RIOT
         path: RIOT
@@ -116,7 +124,13 @@ jobs:
       if: ${{ matrix.pytest_mark == 'not iotlab_creds' }}
       run: |
         sudo RIOT/dist/tools/tapsetup/tapsetup -c 11
+    - name: Install native dependencies
+      if: ${{ matrix.pytest_mark == 'not iotlab_creds' }}
+      run: |
+        sudo apt-get update
+        sudo apt-get install lib32asan6
     - name: Run release tests
+      id: tests
       timeout-minutes: 350
       run: |
         RIOTBASE="$GITHUB_WORKSPACE/RIOT"
@@ -168,6 +182,27 @@ jobs:
         mkdir test-reports/
         junit2html ${REPORT_XML} ${REPORT_NAME}.html
         cp ${REPORT_XML} ${REPORT_NAME}.xml
+    - name: Generate result message
+      if: always()
+      id: generate_results
+      run: |
+        if [ "${{ steps.tests.conclusion }}" == "success" ]; then
+          nice_str="✅ **PASSED**"
+        elif [ "${{ steps.tests.conclusion }}" == "failure" ]; then
+          nice_str="❌ **FAILED**"
+        fi
+        echo "nice_str=${nice_str}" >> ${GITHUB_OUTPUT}
+    - name: Report to Matrix channel
+      if: ${{ always() && steps.generate_results.outputs.nice_str != '' }}
+      uses: s3krit/matrix-message-action@v0.0.3
+      with:
+        room_id: ${{ secrets.RIOT_CI_RELEASE_REPORT_CHANNEL }}
+        access_token: ${{ secrets.MATRIX_RIOT_CI_ACCESS_TOKEN }}
+        server: "matrix.org"
+        message: >
+          ${{ steps.generate_results.outputs.nice_str}}: Release tests
+          `[${{ join(matrix.*, ', ') }}]` on `${{ github.event_name }}`:
+          ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
     - uses: actions/upload-artifact@v2
       if: always()
       with:

.github/workflows/static-test.yml

@@ -4,26 +4,36 @@ on:
   push:
     branches:
       - master
+      - staging
+      - trying
     tags:
       - '[0-9][0-9][0-9][0-9].[0-9][0-9]-RC[0-9]*'
       - '[0-9][0-9][0-9][0-9].[0-9][0-9]'
       - '[0-9][0-9][0-9][0-9].[0-9][0-9].*'
   pull_request:
     branches:
       - '*'
+  merge_group:
 
 jobs:
   static-tests:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@main
       with:
         fetch-depth: 0
+    - name: set CI_BASE_BRANCH
+      run: |
+          if [ -n "${{ github.base_ref }}" ]; then
+              echo "CI_BASE_BRANCH=${{ github.base_ref }}" >> $GITHUB_ENV
+          elif [ -n "${{ github.event.merge_group.base_ref }}" ]; then
+              echo "CI_BASE_BRANCH=${{ github.event.merge_group.base_ref }}" | sed s.=refs/heads/.=. >> $GITHUB_ENV
+          fi
     - name: Setup git
       run: |
-        # Note: ${{ github.base_ref }} is empty when not in a PR
-        if [ -n "${{ github.base_ref }}" ]; then
-          git fetch origin ${{ github.base_ref }}:${{ github.base_ref }} --no-tags
+        # Note: CI_BASE_BRANCH is empty when not in a PR
+        if [ -n "${CI_BASE_BRANCH}" ]; then
+          git fetch origin ${CI_BASE_BRANCH}:${CI_BASE_BRANCH} --no-tags
         else
           git config diff.renameLimit 16384
         fi
@@ -32,9 +42,9 @@ jobs:
       run: docker pull riot/static-test-tools:latest
     - name: Run static-tests
       run: |
-        # Note: ${{ github.base_ref }} is empty when not in a PR
+        # Note: ${CI_BASE_BRANCH} is empty when not in a PR
         docker run --rm                             \
-          -e CI_BASE_BRANCH=${{ github.base_ref }}  \
+          -e CI_BASE_BRANCH                         \
           -e GITHUB_RUN_ID=${GITHUB_RUN_ID}         \
           -v $(pwd):/data/riotbuild                 \
           riot/static-test-tools:latest             \