diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8051acbe..7ca48498 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,7 @@ on: env: DIST_ROOT: ${{ github.event.inputs.custom_dist_root || '/ipns/dist.ipfs.tech' }} # content root used for calculating diff to build - KUBO_VER: 'v0.28.0' # kubo daemon used for chunking and applying diff + KUBO_VER: 'v0.28.0' # kubo daemon used for chunking and applying diff CLUSTER_CTL_VER: 'v1.0.8' # ipfs-cluster-ctl used for pinning concurrency: @@ -161,12 +161,14 @@ jobs: CLUSTER_USER: ${{ secrets.CLUSTER_USER }} CLUSTER_PASSWORD: ${{ secrets.CLUSTER_PASSWORD }} uses: ./.github/actions/setup-ipfs - timeout-minutes: 30 + timeout-minutes: 5 - run: ./dockerized make publish - run: git status - name: Read CID of updated DAG id: cid-reader - run: echo "CID=$(tail -1 ./versions)" >> $GITHUB_OUTPUT + run: | + tail -1 ./versions + echo "CID=$(tail -1 ./versions)" >> $GITHUB_OUTPUT - name: Pin new website to ipfs-websites.collab.ipfscluster.io run: ./scripts/ci/pin-to-cluster.sh env: @@ -175,7 +177,7 @@ jobs: PIN_ADD_EXTRA_ARGS: "" CLUSTER_USER: ${{ secrets.CLUSTER_USER }} CLUSTER_PASSWORD: ${{ secrets.CLUSTER_PASSWORD }} - timeout-minutes: 60 + timeout-minutes: 120 - name: Update PR status with preview link run: ./scripts/ci/github-preview-link.sh env: diff --git a/.tool-versions b/.tool-versions index 750f20b6..40aa8f88 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,2 @@ nodejs 16.15.1 -golang 1.22.3 +golang 1.22.4 diff --git a/dists/go-ipfs/current b/dists/go-ipfs/current index 31950dac..91d002b8 100644 --- a/dists/go-ipfs/current +++ b/dists/go-ipfs/current @@ -1 +1 @@ -v0.28.0 +v0.29.0 diff --git a/dists/go-ipfs/versions b/dists/go-ipfs/versions index 8cb7807d..879b29ea 100644 --- a/dists/go-ipfs/versions +++ b/dists/go-ipfs/versions @@ -111,3 +111,4 @@ v0.28.0-rc1 v0.28.0 v0.29.0-rc1 v0.29.0-rc2 +v0.29.0 diff --git a/dists/kubo/current b/dists/kubo/current index 31950dac..91d002b8 100644 --- a/dists/kubo/current +++ b/dists/kubo/current @@ -1 +1 @@ -v0.28.0 +v0.29.0 diff --git a/dists/kubo/versions b/dists/kubo/versions index 190d0f31..958de544 100644 --- a/dists/kubo/versions +++ b/dists/kubo/versions @@ -41,3 +41,4 @@ v0.28.0-rc1 v0.28.0 v0.29.0-rc1 v0.29.0-rc2 +v0.29.0 diff --git a/scripts/ci/pin-to-cluster.sh b/scripts/ci/pin-to-cluster.sh index f8e46ac7..d3fa9903 100755 --- a/scripts/ci/pin-to-cluster.sh +++ b/scripts/ci/pin-to-cluster.sh @@ -28,12 +28,12 @@ echo "::group::waiting until pinned" --host "/dnsaddr/ipfs-websites.collab.ipfscluster.io" \ --basic-auth "${CLUSTER_USER}:${CLUSTER_PASSWORD}" \ status "$PIN_CID" | tee cluster-pin-status - if [[ $(jq '.peer_map[].status' cluster-pin-status | grep '"pinned"' | wc -l) -ge 2 ]]; then - echo "Got 2 pin confirmations, finishing the workflow" + if [[ $(jq '.peer_map[].status' cluster-pin-status | grep '"pinned"' | wc -l) -ge 1 ]]; then + echo "Got first pin confirmation, finishing the workflow" break else - echo "(sleeping for 15 seconds)" - sleep 15 + echo "Still waiting for at least one pin confirmation, sleeping for 1 minute.." + sleep 60 fi done echo "::endgroup::"