Skip to content

Commit 1d38c00

Browse files
committed
Fix CI pipelines
1 parent 0fdf33a commit 1d38c00

File tree

3 files changed

+20
-53
lines changed

3 files changed

+20
-53
lines changed

.github/workflows/main.yml

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -30,40 +30,21 @@ jobs:
3030
strategy:
3131
fail-fast: false
3232
matrix:
33-
rnwVersion: [ 'latest', '0.72-stable', '0.71-stable'] # test *all* versions that use VS 2022. aka any RNW version >= min in package.json and >= 0.71
33+
rnwVersion: [ '0-73-stable', '0.72-stable', '0.71-stable'] # test *all* versions that use VS 2022. aka any RNW version >= min in package.json and >= 0.71
3434
useRnwNuGet: [false, true] # test building with both RNW source and RNW NuGet
3535
include:
36-
- rnwVersion: 'latest'
37-
rnTemplate: 'react-native@latest'
36+
- rnwVersion: '0-73-stable'
37+
rnVersion: 'react-native@0-73-stable'
3838
- rnwVersion: '0.72-stable'
39-
rnTemplate: 'react-native@0.72-stable'
39+
rnVersion: 'react-native@0.72-stable'
4040
- rnwVersion: '0.71-stable'
41-
rnTemplate: 'react-native@0.71-stable'
41+
rnVersion: 'react-native@0.71-stable'
4242
uses: ./.github/workflows/template-testcli.yml
4343
with:
4444
vmImage: windows-2022
4545
rnwVersion: ${{ matrix.rnwVersion }}
4646
useRnwNuGet: ${{ matrix.useRnwNuGet }}
47-
rnTemplate: ${{ matrix.rnTemplate }}
48-
49-
call-testcli-old:
50-
name: Test CLI (VS 2019)
51-
strategy:
52-
fail-fast: false
53-
matrix:
54-
rnwVersion: ['0.70-stable', '0.69-stable'] # test *all* versions that use VS 2019. aka any RNW version >= min in package.json and < 0.71
55-
useRnwNuGet: [false, true] # test building with both RNW source and RNW NuGet
56-
include:
57-
- rnwVersion: '0.70-stable'
58-
rnTemplate: 'react-native-template-typescript@6.12.11'
59-
- rnwVersion: '0.69-stable'
60-
rnTemplate: 'react-native-template-typescript@6.11.9'
61-
uses: ./.github/workflows/template-testcli.yml
62-
with:
63-
vmImage: windows-2019
64-
rnwVersion: ${{ matrix.rnwVersion }}
65-
useRnwNuGet: ${{ matrix.useRnwNuGet }}
66-
rnTemplate: ${{ matrix.rnTemplate }}
47+
rnVersion: ${{ matrix.rnVersion }}
6748

6849
call-buildnpmpackage:
6950
name: Build NPM Package

.github/workflows/pr.yml

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -42,37 +42,19 @@ jobs:
4242
strategy:
4343
fail-fast: true
4444
matrix:
45-
rnwVersion: ['latest', '0.72-stable'] # test *key* versions that use VS 2022. aka any RNW version >= 0.71 used by supported partners and/or Active/Maintenance from https://microsoft.github.io/react-native-windows/support
45+
rnwVersion: ['0-73-stable', '0.72-stable'] # test *key* versions that use VS 2022. aka any RNW version >= 0.71 used by supported partners and/or Active/Maintenance from https://microsoft.github.io/react-native-windows/support
4646
useRnwNuGet: [false, true] # test building with both RNW source and RNW NuGet
4747
include:
48-
- rnwVersion: 'latest'
49-
rnTemplate: 'react-native@latest'
48+
- rnwVersion: '0-73-stable'
49+
rnVersion: '0-73-stable'
5050
- rnwVersion: '0.72-stable'
51-
rnTemplate: 'react-native@0.72-stable'
51+
rnVersion: '0.72-stable'
5252
uses: ./.github/workflows/template-testcli.yml
5353
with:
5454
vmImage: windows-2022
5555
rnwVersion: ${{ matrix.rnwVersion }}
5656
useRnwNuGet: ${{ matrix.useRnwNuGet }}
57-
rnTemplate: ${{ matrix.rnTemplate }}
58-
59-
call-testcli-old:
60-
name: Test CLI (VS 2019)
61-
needs: setupcheck
62-
strategy:
63-
fail-fast: true
64-
matrix:
65-
rnwVersion: ['0.69-stable'] # test *key* versions that use VS 2019. aka any RNW version < 0.71 that are used by supported partners
66-
useRnwNuGet: [false, true] # test building with both RNW source and RNW NuGet
67-
include:
68-
- rnwVersion: '0.69-stable'
69-
rnTemplate: 'react-native-template-typescript@6.11.9'
70-
uses: ./.github/workflows/template-testcli.yml
71-
with:
72-
vmImage: windows-2019
73-
rnwVersion: ${{ matrix.rnwVersion }}
74-
useRnwNuGet: ${{ matrix.useRnwNuGet }}
75-
rnTemplate: ${{ matrix.rnTemplate }}
57+
rnVersion: ${{ matrix.rnVersion }}
7658

7759
call-buildnpmpackage:
7860
name: Build NPM Package
@@ -98,6 +80,6 @@ jobs:
9880
prcheck:
9981
name: Successful PR Check
10082
runs-on: ubuntu-latest
101-
needs: [setupcheck, call-runcodegen, call-testcli, call-testcli-old, call-buildnpmpackage, call-buildrnx]
83+
needs: [setupcheck, call-runcodegen, call-testcli, call-buildnpmpackage, call-buildrnx]
10284
steps:
10385
- uses: actions/checkout@v3

.github/workflows/template-testcli.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ on:
1515
required: false
1616
default: false
1717
type: boolean
18-
rnTemplate:
18+
rnVersion:
1919
required: false
20-
default: 'react-native@latest'
20+
default: 'latest'
2121
type: string
2222

2323
jobs:
@@ -37,10 +37,14 @@ jobs:
3737
run: yarn link
3838
working-directory: package
3939

40-
- name: create react-native@${{ inputs.rnwVersion }} app
41-
run: npx react-native init testrnx --template ${{ inputs.rnTemplate }}
40+
- name: create react-native@${{ inputs.rnVersion }} app
41+
run: npx @react-native-community/cli init testrnx --version ${{ inputs.rnVersion }} --skip-install --install-pods false --verbose --skip-git-init true
4242
working-directory: ../
4343

44+
- name: yarn install
45+
run: yarn install
46+
working-directory: ../testrnx
47+
4448
- name: add Windows (RNW via ${{ inputs.useRnwNuGet && 'NuGet' || 'Source' }})
4549
run: npx react-native-windows-init --overwrite ${{ inputs.useRnwNuGet && '--experimentalNuGetDependency true' || '' }}
4650
working-directory: ../testrnx

0 commit comments

Comments
 (0)