Resolving merge conflict

libp2p · Nov 20, 2023 · 0da3753 · 0da3753
2 parents f33c3be + dbfda10
commit 0da3753
Show file tree

Hide file tree

Showing 275 changed files with 4,396 additions and 4,000 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -70,7 +70,7 @@ jobs:
           echo "Package version: $PACKAGE_VERSION";
           echo "Specified version: $SPECIFIED_VERSION";
 
-          test "$PACKAGE_VERSION" = "$SPECIFIED_VERSION"
+          test "$PACKAGE_VERSION" = "$SPECIFIED_VERSION" || test "=$PACKAGE_VERSION" = "$SPECIFIED_VERSION"
 
       - name: Ensure manifest and CHANGELOG are properly updated
         if: >
@@ -82,10 +82,11 @@ jobs:
           !contains(github.event.pull_request.labels.*.name, 'internal-change')
         run: |
           git fetch origin master:master
+          git fetch origin ${{ github.event.pull_request.base.ref }}:${{ github.event.pull_request.base.ref }}
           ./scripts/ensure-version-bump-and-changelog.sh
         env:
           HEAD_SHA: ${{ github.event.pull_request.head.sha }}
-
+          PR_BASE: ${{ github.event.pull_request.base.ref }}
 
   wasm_tests:
     name: Run all WASM tests
@@ -279,6 +280,15 @@ jobs:
             cargo check --manifest-path "$toml";
           done
 
+      - uses: taiki-e/cache-cargo-install-action@v1
+        with:
+          tool: [email protected]
+
+      - name: Build webrtc-browser example
+        run: |
+          cd examples/browser-webrtc
+          wasm-pack build --target web --out-dir static
+
   semver:
     runs-on: ubuntu-latest
     steps: