Skip to content

Commit fdf003d

Browse files
committed
updating CI, merging changes from edge-js
1 parent 16c179c commit fdf003d

File tree

5 files changed

+124
-156
lines changed

5 files changed

+124
-156
lines changed

.github/workflows/build-all.yml

+26-16
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@ jobs:
2626
electron: 29
2727
os: ${{ runner.os }}
2828

29-
- name: Electron version
30-
shell: bash
29+
- name: Get latest Electron version for 29.0.0
3130
id: electron-version
32-
run: echo "electron=29.4.6" >> $GITHUB_OUTPUT
31+
shell: bash
32+
run: |
33+
node tools/getVersion.js 29
34+
echo "electron=$(cat electron.txt)" >> $GITHUB_OUTPUT
3335
3436
build-30:
3537
runs-on: windows-2022
@@ -48,11 +50,13 @@ jobs:
4850
electron: 30
4951
os: ${{ runner.os }}
5052

51-
- name: Electron version
52-
shell: bash
53+
- name: Get latest Electron version for 30.0.0
5354
id: electron-version
54-
run: echo "electron=30.5.1" >> $GITHUB_OUTPUT
55-
55+
shell: bash
56+
run: |
57+
node tools/getVersion.js 30
58+
echo "electron=$(cat electron.txt)" >> $GITHUB_OUTPUT
59+
5660
build-31:
5761
runs-on: windows-2022
5862
outputs:
@@ -70,10 +74,12 @@ jobs:
7074
electron: 31
7175
os: ${{ runner.os }}
7276

73-
- name: Electron version
74-
shell: bash
77+
- name: Get latest Electron version for 31.0.0
7578
id: electron-version
76-
run: echo "electron=31.7.5" >> $GITHUB_OUTPUT
79+
shell: bash
80+
run: |
81+
node tools/getVersion.js 31
82+
echo "electron=$(cat electron.txt)" >> $GITHUB_OUTPUT
7783
7884
build-32:
7985
runs-on: windows-2022
@@ -92,10 +98,12 @@ jobs:
9298
electron: 32
9399
os: ${{ runner.os }}
94100

95-
- name: Electron version
96-
shell: bash
101+
- name: Get latest Electron version for 32.0.0
97102
id: electron-version
98-
run: echo "electron=32.2.6" >> $GITHUB_OUTPUT
103+
shell: bash
104+
run: |
105+
node tools/getVersion.js 32
106+
echo "electron=$(cat electron.txt)" >> $GITHUB_OUTPUT
99107
100108
build-33:
101109
runs-on: windows-2022
@@ -114,10 +122,12 @@ jobs:
114122
electron: 33
115123
os: ${{ runner.os }}
116124

117-
- name: Electron version
118-
shell: bash
125+
- name: Get latest Electron version for 33.0.0
119126
id: electron-version
120-
run: echo "electron=33.2.1" >> $GITHUB_OUTPUT
127+
shell: bash
128+
run: |
129+
node tools/getVersion.js 33
130+
echo "electron=$(cat electron.txt)" >> $GITHUB_OUTPUT
121131
122132
test-29:
123133
strategy:

.github/workflows/build.yml

+6-24
Original file line numberDiff line numberDiff line change
@@ -31,43 +31,25 @@ env:
3131

3232
jobs:
3333
build:
34-
runs-on: ${{ matrix.os }}
34+
runs-on: windows-2022
3535
outputs:
3636
test-version: ${{ steps.electron-test-version.outputs.test-version }}
3737
strategy:
38-
# fail-fast: false
39-
matrix:
40-
os: [windows-2022]
38+
fail-fast: true
4139

42-
name: build ${{ matrix.os }}-electron-${{ inputs.build-version }}
40+
name: build electron-${{ inputs.build-version }}
4341
steps:
4442

4543
- name: Checkout code
4644
uses: actions/checkout@v4
4745

48-
# - name: Resolve Electron version from major
49-
# id: electron-test-version
50-
# shell: bash
51-
# run: |
52-
# if [[ ${{ inputs.build-version }} == '29' ]]; then
53-
# echo "test-version=29.4.6" >> $GITHUB_OUTPUT
54-
# elif [[ ${{ inputs.build-version }} == '30' ]]; then
55-
# echo "test-version=30.5.1" >> $GITHUB_OUTPUT
56-
# elif [[ ${{ inputs.build-version }} == '31' ]]; then
57-
# echo "test-version=31.7.5" >> $GITHUB_OUTPUT
58-
# elif [[ ${{ inputs.build-version }} == '32' ]]; then
59-
# echo "test-version=32.2.6" >> $GITHUB_OUTPUT
60-
# elif [[ ${{ inputs.build-version }} == '33' ]]; then
61-
# echo "test-version=33.2.1" >> $GITHUB_OUTPUT
62-
# fi
63-
6446
- name: Setup env
6547
uses: ./.github/actions/setup-env
6648
with:
6749
electron: '${{ inputs.build-version }}.0.0'
68-
os: ${{ matrix.os }}
69-
70-
- name: Get latestElectron version for v${{ inputs.build-version }}
50+
os: ${{ runner.os }}
51+
52+
- name: Get latest Electron version for ${{ inputs.build-version }}.0.0
7153
id: electron-test-version
7254
shell: bash
7355
run: |

src/double/Edge.js/Edge.js.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,6 @@
6262
<ItemGroup>
6363
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.9.2" />
6464
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
65-
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
65+
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.2" />
6666
</ItemGroup>
6767
</Project>

0 commit comments

Comments
 (0)