diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 062228fdc..2ba7afd4d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,14 +11,9 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} IS_OFFICIAL_REPO: ${{ github.repository == 'temporalio/sdk-typescript' }} # Is it the official main branch, or an official release branches? - IS_MAIN_OR_RELEASE: | - ${{ - github.repository == 'temporalio/sdk-typescript' - && (github.ref == 'refs/heads/main' - || startsWith(github.ref, 'refs/tags/') - || startsWith(github.ref, 'refs/heads/releases')) - && github.event_name != 'pull_request' - }} + # AFAIK there's no way to break that line w/o introducing a trailing LF that breaks usage. Sorry. + IS_MAIN_OR_RELEASE: ${{ github.repository == 'temporalio/sdk-typescript' && ( github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/releases')) && github.event_name != 'pull_request' }} + # Use these variables to force specific version of CLI/Time Skipping Server for SDK tests # TESTS_CLI_VERSION: 'v0.13.2' # TESTS_TIME_SKIPPING_SERVER_VERSION: 'v1.24.1' @@ -105,7 +100,7 @@ jobs: prefix-key: corebridge-buildcache shared-key: ${{ matrix.platform }} env-vars: '' - save-if: env.IS_MAIN_OR_RELEASE == 'true' + save-if: ${{ env.IS_MAIN_OR_RELEASE == 'true' }} - name: Compile rust code if: steps.cached-artifact.outputs.cache-hit != 'true' @@ -203,7 +198,7 @@ jobs: - name: Save NPM cache uses: actions/cache/save@v4 # Only saves NPM cache from the main branch, to reduce pressure on the cache (limited to 10GB). - if: env.IS_MAIN_OR_RELEASE == 'true' + if: ${{ env.IS_MAIN_OR_RELEASE == 'true' }} with: path: ${{ steps.npm-cache-dir.outputs.dir }} key: npm-main-${{ matrix.platform }}-${{ hashFiles('./package-lock.json') }} @@ -571,7 +566,7 @@ jobs: ALGOLIA_API_KEY: ${{ secrets.ALGOLIA_API_KEY }} - name: Deploy prod docs # TODO: only deploy prod docs when we publish a new version - if: env.IS_MAIN_OR_RELEASE == 'true' + if: ${{ env.IS_MAIN_OR_RELEASE == 'true' }} run: npx vercel deploy packages/docs/build -t ${{ secrets.VERCEL_TOKEN }} --name typescript --scope temporal --prod --yes # FIXME: This is not working properly, and should probably be done only from the main branch anyway diff --git a/.github/workflows/stress.yml b/.github/workflows/stress.yml index 96abfaa5f..48190f435 100644 --- a/.github/workflows/stress.yml +++ b/.github/workflows/stress.yml @@ -43,14 +43,9 @@ env: TEMPORAL_TESTING_MEM_LOG_DIR: /tmp/worker-mem-logs GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} REUSE_V8_CONTEXT: ${{ inputs.reuse-v8-context }} - IS_MAIN_BRANCH: | - ${{ - github.repository == 'temporalio/sdk-typescript' - && (github.ref == 'refs/heads/main' - || startsWith(github.ref, 'refs/tags/') - || startsWith(github.ref, 'refs/heads/releases')) - && github.event_name != 'pull_request' - }} + # Is it the official main branch, or an official release branches? + # AFAIK there's no way to break that line w/o introducing a trailing LF that breaks usage. Sorry. + IS_MAIN_OR_RELEASE: ${{ github.repository == 'temporalio/sdk-typescript' && ( github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/releases')) && github.event_name != 'pull_request' }} jobs: stress-test: @@ -62,6 +57,7 @@ jobs: - uses: actions/checkout@v4 with: submodules: recursive + ref: ${{ inputs.ref }} - name: Install Node uses: actions/setup-node@v4 @@ -99,7 +95,7 @@ jobs: prefix-key: corebridge-buildcache shared-key: linux-intel env-vars: '' - save-if: env.IS_MAIN_BRANCH == 'true' + save-if: ${{ env.IS_MAIN_OR_RELEASE == 'true' }} - name: Download dependencies # Make up to 3 attempts to install NPM dependencies, to work around transient NPM errors diff --git a/package-lock.json b/package-lock.json index 33b5c7648..9738a3308 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4777,9 +4777,9 @@ "dev": true }, "node_modules/axios": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.1.tgz", - "integrity": "sha512-+LV37nQcd1EpFalkXksWNBiA17NZ5m5/WspmHGmZmdx1qBOg/VNq/c4eRJiA9VQQHBOs+N0ZhhdU10h2TyNK7Q==", + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz", + "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==", "dev": true, "dependencies": { "follow-redirects": "^1.15.6", @@ -22545,9 +22545,9 @@ "dev": true }, "axios": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.1.tgz", - "integrity": "sha512-+LV37nQcd1EpFalkXksWNBiA17NZ5m5/WspmHGmZmdx1qBOg/VNq/c4eRJiA9VQQHBOs+N0ZhhdU10h2TyNK7Q==", + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz", + "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==", "dev": true, "requires": { "follow-redirects": "^1.15.6", diff --git a/package.json b/package.json index 23d2a0192..0e57d92bc 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "lint.prune": "ts-prune --error -p tsconfig.prune.json --ignore \"used in module\" --skip \".d.ts\"", "format": "prettier --write . && lerna run --no-bail --stream format", "clean": "node ./scripts/clean.mjs", - "docs": "lerna run --stream maybe-install-deps-and-build-docs" + "docs": "cd packages/docs && npm run maybe-install-deps-and-build-docs" }, "dependencies": { "@temporalio/client": "file:packages/client", diff --git a/packages/docs/package.json b/packages/docs/package.json index a6738181c..329daf6d4 100644 --- a/packages/docs/package.json +++ b/packages/docs/package.json @@ -1,6 +1,5 @@ { "name": "@temporalio/docs", - "version": "1.9.3", "private": true, "scripts": { "docusaurus": "docusaurus",