Skip to content

Commit 0f24d46

Browse files
committed
Merge branch 'main' into rvermeulen/extend-init-complete-status-report
Signed-off-by: Remco Vermeulen <[email protected]>
2 parents e6c9383 + 9c646c2 commit 0f24d46

32 files changed

+401
-373
lines changed

.github/workflows/__all-platform-bundle.yml

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

.github/workflows/__build-mode-manual.yml

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

.github/workflows/__export-file-baseline-information.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__multi-language-autodetect.yml

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

.github/workflows/__scaling-reserved-ram.yml

Lines changed: 0 additions & 104 deletions
This file was deleted.

.github/workflows/__swift-custom-build.yml

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

.github/workflows/__test-local-codeql.yml

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

.github/workflows/__unset-environment.yml

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

.github/workflows/debug-artifacts.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,8 @@ jobs:
5252
debug: true
5353
debug-artifact-name: my-debug-artifacts
5454
debug-database-name: my-db
55-
- uses: ./../action/.github/actions/setup-swift
56-
with:
57-
codeql-path: ${{ steps.init.outputs.codeql-path }}
55+
# We manually exclude Swift from the languages list here, as it is not supported on Ubuntu
56+
languages: cpp,csharp,go,java,javascript,python,ruby
5857
- name: Build code
5958
shell: bash
6059
run: ./build.sh

.github/workflows/pr-checks.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ name: PR Checks
22

33
on:
44
push:
5-
branches: [main, releases/v*]
65
pull_request:
76
# Run checks on reopened draft PRs to support triggering PR checks on draft PRs that were opened
87
# by other workflows.
@@ -53,6 +52,7 @@ jobs:
5352
run: .github/workflows/script/check-js.sh
5453

5554
check-node-modules:
55+
if: github.event_name != 'push' || github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/releases/v')
5656
name: Check modules up to date
5757
runs-on: macos-latest
5858
timeout-minutes: 45
@@ -63,6 +63,7 @@ jobs:
6363
run: .github/workflows/script/check-node-modules.sh
6464

6565
check-file-contents:
66+
if: github.event_name != 'push' || github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/releases/v')
6667
name: Check file contents
6768
runs-on: ubuntu-latest
6869
timeout-minutes: 45
@@ -87,6 +88,7 @@ jobs:
8788
run: .github/workflows/script/verify-pr-checks.sh
8889

8990
npm-test:
91+
if: github.event_name != 'push' || github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/releases/v')
9092
name: Unit Test
9193
needs: [check-js, check-node-modules]
9294
strategy:
@@ -106,7 +108,7 @@ jobs:
106108
npm test
107109
108110
check-node-version:
109-
if: ${{ github.event.pull_request }}
111+
if: github.event.pull_request
110112
name: Check Action Node versions
111113
runs-on: ubuntu-latest
112114
timeout-minutes: 45

0 commit comments

Comments
 (0)