Skip to content

Commit 88c848e

Browse files
committed
Fix sub-workflow for operation-location-migration
1 parent de03392 commit 88c848e

3 files changed

Lines changed: 66 additions & 64 deletions

File tree

.github/workflows/ci.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,6 @@ jobs:
4343
echo "operation-location-migration-e2e=$(./tools/ci/bin/check-affected.sh lib operation-location-migration-e2e origin/master)" >> $GITHUB_OUTPUT
4444
cat $GITHUB_OUTPUT
4545
46-
start-operation-location-migration:
47-
needs: precheck
48-
if: ${{ needs.precheck.outputs.affected-operation-location-migration == 'true' || needs.precheck.outputs.affected-operation-location-migration-e2e == 'true' }}
49-
uses: ./.github/workflows/operation-location-migration.yml
50-
5146
typescript-resolver-files:
5247
needs: precheck
5348
if: ${{ needs.precheck.outputs.affected-typescript-resolver-files == 'true' }}
@@ -57,3 +52,13 @@ jobs:
5752
needs: precheck
5853
if: ${{ needs.precheck.outputs.affected-typescript-resolver-files == 'true' || needs.precheck.outputs.affected-typescript-resolver-files-e2e == 'true' }}
5954
uses: ./.github/workflows/typescript-resolver-files-e2e.yml
55+
56+
operation-location-migration:
57+
needs: precheck
58+
if: ${{ needs.precheck.outputs.affected-operation-location-migration == 'true' }}
59+
uses: ./.github/workflows/operation-location-migration.yml
60+
61+
operation-location-migration-e2e:
62+
needs: precheck
63+
if: ${{ needs.precheck.outputs.affected-operation-location-migration == 'true' || needs.precheck.outputs.affected-operation-location-migration-e2e == 'true' }}
64+
uses: ./.github/workflows/operation-location-migration-e2e.yml
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
on:
2+
workflow_call:
3+
4+
env:
5+
node-version: '22.x'
6+
7+
jobs:
8+
operation-location-migration-e2e:
9+
strategy:
10+
matrix:
11+
os: [ubuntu-22.04, windows-latest]
12+
node-version: [18.x, 20.x, 22.x]
13+
runs-on: ${{ matrix.os }}
14+
defaults:
15+
run:
16+
shell: bash
17+
steps:
18+
- name: Check out repository
19+
uses: actions/checkout@v4
20+
with:
21+
fetch-depth: 0
22+
23+
- name: Set up Node.js ${{ matrix.node-version }}
24+
uses: actions/setup-node@v4
25+
with:
26+
node-version: ${{ matrix.node-version }}
27+
cache: yarn
28+
cache-dependency-path: '**/yarn.lock'
29+
30+
- name: Install deps
31+
run: yarn install --prefer-offline
32+
33+
- name: e2e
34+
run: yarn nx e2e operation-location-migration-e2e
Lines changed: 22 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,35 @@
11
on:
22
workflow_call:
33

4-
concurrency:
5-
group: ${{ github.workflow }}-${{ github.ref }}
6-
cancel-in-progress: true
7-
84
env:
95
node-version: '22.x'
106

117
jobs:
12-
test-workflow:
13-
runs-on: ubuntu-22.04
8+
operation-location-migration:
9+
strategy:
10+
matrix:
11+
os: [ubuntu-22.04, windows-latest]
12+
node-version: [18.x, 20.x, 22.x]
13+
runs-on: ${{ matrix.os }}
1414
steps:
15-
- name: Test
16-
run: echo "READY"
17-
# operation-location-migration:
18-
# strategy:
19-
# matrix:
20-
# os: [ubuntu-22.04, windows-latest]
21-
# node-version: [18.x, 20.x, 22.x]
22-
# runs-on: ${{ matrix.os }}
23-
# steps:
24-
# - name: Check out repository
25-
# uses: actions/checkout@v4
26-
27-
# - name: Set up Node.js ${{ matrix.node-version }}
28-
# uses: actions/setup-node@v4
29-
# with:
30-
# node-version: ${{ matrix.node-version }}
31-
# cache: yarn
32-
# cache-dependency-path: '**/yarn.lock'
33-
34-
# - name: Install deps
35-
# run: yarn install --prefer-offline
15+
- name: Check out repository
16+
uses: actions/checkout@v4
3617

37-
# - name: Lint
38-
# run: yarn nx lint operation-location-migration
18+
- name: Set up Node.js ${{ matrix.node-version }}
19+
uses: actions/setup-node@v4
20+
with:
21+
node-version: ${{ matrix.node-version }}
22+
cache: yarn
23+
cache-dependency-path: '**/yarn.lock'
3924

40-
# - name: Test
41-
# run: yarn nx test operation-location-migration
25+
- name: Install deps
26+
run: yarn install --prefer-offline
4227

43-
# - name: Build
44-
# run: yarn nx build operation-location-migration
28+
- name: Lint
29+
run: yarn nx lint operation-location-migration
4530

46-
# operation-location-migration-e2e:
47-
# strategy:
48-
# matrix:
49-
# os: [ubuntu-22.04, windows-latest]
50-
# node-version: [18.x, 20.x, 22.x]
51-
# runs-on: ${{ matrix.os }}
52-
# defaults:
53-
# run:
54-
# shell: bash
55-
# steps:
56-
# - name: Check out repository
57-
# uses: actions/checkout@v4
58-
# with:
59-
# fetch-depth: 0
60-
61-
# - name: Set up Node.js ${{ matrix.node-version }}
62-
# uses: actions/setup-node@v4
63-
# with:
64-
# node-version: ${{ matrix.node-version }}
65-
# cache: yarn
66-
# cache-dependency-path: '**/yarn.lock'
67-
68-
# - name: Install deps
69-
# run: yarn install --prefer-offline
31+
- name: Test
32+
run: yarn nx test operation-location-migration
7033

71-
# - name: e2e
72-
# run: yarn nx e2e operation-location-migration-e2e
34+
- name: Build
35+
run: yarn nx build operation-location-migration

0 commit comments

Comments
 (0)