Merge remote-tracking branch 'origin/master' into libp2p-rcmgr-metrics

Author: lidel

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: [ipshipyard.gitwallet.co]

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -18,7 +18,7 @@ body:
       label: Checklist
       description: Please verify that you've followed these steps
       options:
-        - label: This is a bug report, not a question. Ask questions on [discuss.ipfs.io](https://discuss.ipfs.io).
+        - label: This is a bug report, not a question. Ask questions on [discuss.ipfs.tech](https://discuss.ipfs.tech/c/help/13).
           required: true
         - label: I have searched on the [issue tracker](https://github.com/ipfs/kubo/issues?q=is%3Aissue) for my bug.
           required: true
@@ -32,8 +32,9 @@ body:
       label: Installation method
       description: Please select your installation method
       options:
+        - dist.ipfs.tech or ipfs-update
+        - docker image
         - ipfs-desktop
-        - ipfs-update or dist.ipfs.tech
         - third-party binary
         - built from source
   - type: textarea

.github/ISSUE_TEMPLATE/config.yml

@@ -1,17 +1,17 @@
 blank_issues_enabled: false
 contact_links:
  - name: Getting Help on IPFS
-   url: https://ipfs.io/help
+   url: https://ipfs.tech/help
    about: All information about how and where to get help on IPFS.
  - name: Kubo configuration reference
    url: https://github.com/ipfs/kubo/blob/master/docs/config.md#readme
    about: Documentation on the different configuration settings
  - name: Kubo experimental features docs
    url: https://github.com/ipfs/kubo/blob/master/docs/experimental-features.md#readme
    about: Documentation on Private Networks, Filestore and other experimental features.
- - name: RPC API Reference
+ - name: Kubo RPC API Reference
    url: https://docs.ipfs.tech/reference/kubo/rpc/
    about: Documentation of all Kubo RPC API endpoints.
- - name: IPFS Official Forum
-   url: https://discuss.ipfs.io
+ - name: IPFS Official Discussion Forum
+   url: https://discuss.ipfs.tech
    about: Please post general questions, support requests, and discussions here.

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -6,11 +6,11 @@ body:
   - type: markdown
     attributes:
       value: |
-        Suggest an enhancement to Kubo (the program). If you'd like to suggest an improvement to the IPFS protocol, please discuss it on [the forum](https://discuss.ipfs.io).
+        Suggest an enhancement to Kubo (the program). If you'd like to suggest an improvement to the IPFS protocol, please discuss it on [the forum](https://discuss.ipfs.tech).
 
         Issues in this repo must be specific, actionable, and well motivated. They should be starting points for _building_ new features, not brainstorming ideas.
 
-        If you have an idea you'd like to discuss, please open a new thread on [the forum](https://discuss.ipfs.io).
+        If you have an idea you'd like to discuss, please open a new thread on [the forum](https://discuss.ipfs.tech).
 
         **Example:**
 

.github/ISSUE_TEMPLATE/feature.yml

@@ -6,11 +6,11 @@ body:
   - type: markdown
     attributes:
       value: |
-        Suggest a new feature in Kubo (the program). If you'd like to suggest an improvement to the IPFS protocol, please discuss it on [the forum](https://discuss.ipfs.io).
+        Suggest a new feature in Kubo (the program). If you'd like to suggest an improvement to the IPFS protocol, please discuss it on [the forum](https://discuss.ipfs.tech).
 
         Issues in this repo must be specific, actionable, and well motivated. They should be starting points for _building_ new features, not brainstorming ideas.
 
-        If you have an idea you'd like to discuss, please open a new thread on [the forum](https://discuss.ipfs.io).
+        If you have an idea you'd like to discuss, please open a new thread on [the forum](https://discuss.ipfs.tech).
 
         **Example:**
 

.github/dependabot.yml

@@ -1,13 +1,5 @@
 version: 2
 updates:
-  - package-ecosystem: gomod
-    directory: "/"
-    schedule:
-      interval: daily
-      time: "11:00"
-    open-pull-requests-limit: 10
-    labels:
-      - "topic/dependencies"            
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

.github/workflows/codeql-analysis.yml

@@ -29,16 +29,21 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
+
+    - name: Setup Go
+      uses: actions/setup-go@v5
+      with:
+        go-version: 1.23.x
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: go
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/docker-build.yml

@@ -26,9 +26,9 @@ jobs:
       run:
         shell: bash
     steps:
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v5
         with:
-          go-version: 1.19.x
-      - uses: actions/checkout@v3
+          go-version: 1.23.x
+      - uses: actions/checkout@v4
       - run: docker build -t $IMAGE_NAME:$WIP_IMAGE_TAG .
       - run: docker run --rm $IMAGE_NAME:$WIP_IMAGE_TAG --version

.github/workflows/docker-image.yml

@@ -7,6 +7,10 @@ on:
         description: 'Push to Docker Hub'
         required: true
         default: 'false'
+      tags:
+        description: 'Custom tags to use for the push'
+        required: false
+        default: ''
   # # If we decide to build all images on every PR, we should make sure that
   # # they are NOT pushed to Docker Hub.
   # pull_request:
@@ -15,6 +19,7 @@ on:
   push:
     branches:
       - 'master'
+      - 'staging'
       - 'bifrost-*'
     tags:
       - 'v*'
@@ -27,22 +32,22 @@ jobs:
     if: github.repository == 'ipfs/kubo' || github.event_name == 'workflow_dispatch'
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
-    timeout-minutes: 90
+    timeout-minutes: 15
     env:
       IMAGE_NAME: ipfs/kubo
       LEGACY_IMAGE_NAME: ipfs/go-ipfs
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Cache Docker layers
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}
@@ -51,14 +56,15 @@ jobs:
 
       - name: Get tags
         id: tags
+        if: github.event.inputs.tags == ''
         run: |
           echo "value<<EOF" >> $GITHUB_OUTPUT
           ./bin/get-docker-tags.sh "$(date -u +%F)" >> $GITHUB_OUTPUT
           echo "EOF" >> $GITHUB_OUTPUT
         shell: bash
 
       - name: Log in to Docker Hub
-        uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc
+        uses: docker/login-action@v3
         with:
           username: ${{ vars.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
@@ -67,7 +73,7 @@ jobs:
       # builds, only one platform is being loaded into the cache. This would
       # prevent us from testing the other platforms.
       - name: Build Docker image (linux/amd64)
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           platforms: linux/amd64
           context: .
@@ -79,7 +85,7 @@ jobs:
           cache-to: type=local,dest=/tmp/.buildx-cache-new
 
       - name: Build Docker image (linux/arm/v7)
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           platforms: linux/arm/v7
           context: .
@@ -91,7 +97,7 @@ jobs:
           cache-to: type=local,dest=/tmp/.buildx-cache-new
 
       - name: Build Docker image (linux/arm64/v8)
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           platforms: linux/arm64/v8
           context: .
@@ -104,20 +110,28 @@ jobs:
 
       # We test all the images on amd64 host here. This uses QEMU to emulate
       # the other platforms.
-      - run: docker run --rm $IMAGE_NAME:linux-amd64 --version
-      - run: docker run --rm $IMAGE_NAME:linux-arm-v7 --version
-      - run: docker run --rm $IMAGE_NAME:linux-arm64-v8 --version
+      # NOTE: --version should finish instantly, but sometimes
+      # it hangs on github CI (could be qemu issue), so we retry to remove false negatives
+      - name: Smoke-test linux-amd64
+        run: for i in {1..3}; do timeout 15s docker run --rm $IMAGE_NAME:linux-amd64 version --all && break || [ $i = 3 ] && exit 1; done
+        timeout-minutes: 1
+      - name: Smoke-test linux-arm-v7
+        run: for i in {1..3}; do timeout 15s docker run --rm $IMAGE_NAME:linux-arm-v7 version --all && break || [ $i = 3 ] && exit 1; done
+        timeout-minutes: 1
+      - name: Smoke-test linux-arm64-v8
+        run: for i in {1..3}; do timeout 15s docker run --rm $IMAGE_NAME:linux-arm64-v8 version --all && break || [ $i = 3 ] && exit 1; done
+        timeout-minutes: 1
 
       # This will only push the previously built images.
       - if: github.event_name != 'workflow_dispatch' || github.event.inputs.push == 'true'
         name: Publish to Docker Hub
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
           context: .
           push: true
           file: ./Dockerfile
-          tags: "${{ steps.tags.outputs.value }}"
+          tags: "${{ github.event.inputs.tags || steps.tags.outputs.value }}"
           cache-from: type=local,src=/tmp/.buildx-cache-new
           cache-to: type=local,dest=/tmp/.buildx-cache-new