Skip to content

Commit 12062bc

Browse files
authored
Merge branch 'main' into handle_temporal_builtin_prefixes
2 parents 55c641f + 8d489e3 commit 12062bc

File tree

28 files changed

+66
-44
lines changed

28 files changed

+66
-44
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ jobs:
7777
version: '23.x'
7878
repo-token: ${{ secrets.GITHUB_TOKEN }}
7979

80+
- name: Upgrade Rust to latest stable
81+
uses: dtolnay/rust-toolchain@stable
82+
8083
- name: Rust Cargo and Build cache
8184
if: steps.cached-artifact.outputs.cache-hit != 'true'
8285
uses: Swatinem/rust-cache@v2
@@ -105,7 +108,7 @@ jobs:
105108
# Run integration tests.
106109
# Uses the native binaries built in compile-native-binaries, but build `@temporalio/*` packages locally.
107110
integration-tests:
108-
timeout-minutes: 15
111+
timeout-minutes: 20
109112
needs:
110113
- compile-native-binaries-debug
111114
strategy:

.github/workflows/conventions.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ jobs:
4040
version: '23.x'
4141
repo-token: ${{ secrets.GITHUB_TOKEN }}
4242

43+
- name: Upgrade Rust to latest stable
44+
uses: dtolnay/rust-toolchain@stable
45+
with:
46+
components: clippy
47+
4348
- name: Rust Cargo and Build cache
4449
uses: Swatinem/rust-cache@v2
4550
with:

.github/workflows/release.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ jobs:
7575
version: '23.x'
7676
repo-token: ${{ secrets.GITHUB_TOKEN }}
7777

78+
- name: Upgrade Rust to latest stable
79+
uses: dtolnay/rust-toolchain@stable
80+
7881
# FIXME: Setup volumes so that we can benefit from the cache in the Docker-build scenario.
7982
# Or maybe just get rid of the cache entirely if it doesn't have sufficient benefits.
8083
- name: Rust Cargo and Build cache

.github/workflows/stress.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@ jobs:
8383
version: '23.x'
8484
repo-token: ${{ secrets.GITHUB_TOKEN }}
8585

86+
- name: Upgrade Rust to latest stable
87+
uses: dtolnay/rust-toolchain@stable
88+
8689
- name: Rust Cargo and Build cache
8790
uses: Swatinem/rust-cache@v2
8891
with:

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.12.0-rc.0",
2+
"version": "1.12.1",
33
"npmClient": "npm",
44
"command": {
55
"publish": {

package-lock.json

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/activity/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@temporalio/activity",
3-
"version": "1.12.0-rc.0",
3+
"version": "1.12.1",
44
"description": "Temporal.io SDK Activity sub-package",
55
"main": "lib/index.js",
66
"types": "./lib/index.d.ts",

packages/client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@temporalio/client",
3-
"version": "1.12.0-rc.0",
3+
"version": "1.12.1",
44
"description": "Temporal.io SDK Client sub-package",
55
"main": "lib/index.js",
66
"types": "./lib/index.d.ts",

packages/cloud/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@temporalio/cloud",
3-
"version": "1.12.0-rc.0",
3+
"version": "1.12.1",
44
"description": "Temporal.io SDK — Temporal Cloud Client",
55
"main": "lib/index.js",
66
"types": "./lib/index.d.ts",

packages/common/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@temporalio/common",
3-
"version": "1.12.0-rc.0",
3+
"version": "1.12.1",
44
"description": "Common library for code that's used across the Client, Worker, and/or Workflow",
55
"main": "lib/index.js",
66
"types": "./lib/index.d.ts",

0 commit comments

Comments
 (0)