Merge branch 'dfinity:master' into test-uis-with-playwright

dfinity · Sep 12, 2023 · 0a2f2e7 · 0a2f2e7
2 parents 4ec9fd3 + 5bcf9cc
commit 0a2f2e7
Show file tree

Hide file tree

Showing 50 changed files with 409 additions and 450 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -141,9 +141,6 @@ jobs:
           echo "archive=$(pwd)/e2e/archive" >> "$GITHUB_ENV"
           echo "assets=$(pwd)/e2e/assets" >> "$GITHUB_ENV"
           echo "utils=$(pwd)/e2e/utils" >> "$GITHUB_ENV"
-          if [ "${{ matrix.backend }}" == "ic-ref" ]; then
-              echo "USE_IC_REF=1" >> "$GITHUB_ENV"
-          fi
           export
       - name: Download bats-support as a git submodule
         run: git submodule update --init --recursive

diff --git a/.github/workflows/update-replica-version.yml b/.github/workflows/update-replica-version.yml
@@ -68,10 +68,10 @@ jobs:
         git config committer.name "GitHub Actions Bot"
         git config user.email "${{ github.event.sender.id }}+${{ github.event.sender.login }}@users.noreply.github.com"
         git config user.name "${{ github.event.sender.login }}"
-        git checkout -b chore-update-replica-${{ env.REPLICA_VERSION }} 
+        git checkout -b chore-update-replica-${{ env.REPLICA_VERSION }}-${{ github.event.inputs.sdkBranch }}
         git add .
         git commit -m "chore: update replica version to ${{ env.REPLICA_VERSION }}"
-        git push origin chore-update-replica-${{ env.REPLICA_VERSION }} 
+        git push origin chore-update-replica-${{ env.REPLICA_VERSION }}-${{ github.event.inputs.sdkBranch }}
       
     - name: create Pull Request, with CHANGELOG.md entry suggestion 
       uses: actions/github-script@v6
@@ -113,10 +113,10 @@ jobs:
             title: `chore: update replica version to ${new_replica_sha__short}`,
             owner,
             repo,
-            head: 'chore-update-replica-${{ env.REPLICA_VERSION }}',
+            head: 'chore-update-replica-${{ env.REPLICA_VERSION }}-${{ github.event.inputs.sdkBranch }}',
             base: '${{ github.event.inputs.sdkBranch }}',
             body: [
-              `## Suggested [CHANGELOG.md](https://github.com/${owner}/${repo}/edit/chore-update-replica-${{ env.REPLICA_VERSION }}/CHANGELOG.md) changes`,
+              `## Suggested [CHANGELOG.md](https://github.com/${owner}/${repo}/edit/chore-update-replica-${{ env.REPLICA_VERSION }}-${{ github.event.inputs.sdkBranch }}/CHANGELOG.md) changes`,
               '```',
               '## Dependencies',
               '',

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 # UNRELEASED
 
+### fix: Include remote canisters in canisters_to_generate
+
+Generate frontend declarations for remote canisters too because frontend JS code may want to call them.
+
+### feat: Updated handling of missing values in state tree certificates
+
+The `Unknown` lookup of a path in a certificate results in an `AgentError` (the IC returns `Absent` for non-existing paths).
+
+### fix: dfx deploy urls printed for asset canisters
+
 ### chore: --emulator parameter is deprecated and will be discontinued soon
 
 Added warning that the `--emulator` is deprecated and will be discontinued soon.
@@ -165,9 +175,12 @@ Updated Motoko to [0.9.7](https://github.com/dfinity/motoko/releases/tag/0.9.7)
 
 ### Replica
 
-Updated replica to elected commit 3bcccef07408921fe849c92dd2437adc157ef9c3.
+Updated replica to elected commit cabe2ae3ca115b1a3f24d75814d4f8e317b2964d.
 This incorporates the following executed proposals:
 
+- [124331](https://dashboard.internetcomputer.org/proposal/124331)
+- [124330](https://dashboard.internetcomputer.org/proposal/124330)
+- [124272](https://dashboard.internetcomputer.org/proposal/124272)
 - [124021](https://dashboard.internetcomputer.org/proposal/124021)
 - [123977](https://dashboard.internetcomputer.org/proposal/123977)
 - [123976](https://dashboard.internetcomputer.org/proposal/123976)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -56,16 +56,6 @@ sdk $ bats e2e/tests-dfx/*.bash
 sdk $ bats e2e/tests-replica/*.bash
 ```
 
-#### Running End-to-End Tests Against Reference IC
-
-This runs the end-to-end tests against the
-[reference implementation of the Internet Computer](https://github.com/dfinity/ic-hs).
-
-``` bash
-sdk $ USE_IC_REF=1 bats e2e/tests-dfx/*.bash
-sdk $ USE_IC_REF=1 bats e2e/tests-replica/*.bash
-```
-
 ## Conventional Commits
 
 We use a squash & merge PR strategy, which means that each PR will result in exactly