updating CI, merging changes from edge-js

agracio · Dec 5, 2024 · fdf003d · fdf003d
1 parent 16c179c
commit fdf003d
Show file tree

Hide file tree

Showing 5 changed files with 124 additions and 156 deletions.
diff --git a/.github/workflows/build-all.yml b/.github/workflows/build-all.yml
@@ -26,10 +26,12 @@ jobs:
           electron: 29
           os: ${{ runner.os }}
 
-      - name: Electron version
-        shell: bash
+      - name: Get latest Electron version for 29.0.0
         id: electron-version
-        run: echo "electron=29.4.6" >> $GITHUB_OUTPUT
+        shell: bash
+        run: |
+          node tools/getVersion.js 29
+          echo "electron=$(cat electron.txt)" >> $GITHUB_OUTPUT
 
   build-30:
     runs-on: windows-2022
@@ -48,11 +50,13 @@ jobs:
           electron: 30
           os: ${{ runner.os }}
 
-      - name: Electron version
-        shell: bash
+      - name: Get latest Electron version for 30.0.0
         id: electron-version
-        run: echo "electron=30.5.1" >> $GITHUB_OUTPUT
-
+        shell: bash
+        run: |
+          node tools/getVersion.js 30
+          echo "electron=$(cat electron.txt)" >> $GITHUB_OUTPUT
+  
   build-31:
     runs-on: windows-2022
     outputs:
@@ -70,10 +74,12 @@ jobs:
           electron: 31
           os: ${{ runner.os }}
 
-      - name: Electron version
-        shell: bash
+      - name: Get latest Electron version for 31.0.0
         id: electron-version
-        run: echo "electron=31.7.5" >> $GITHUB_OUTPUT
+        shell: bash
+        run: |
+          node tools/getVersion.js 31
+          echo "electron=$(cat electron.txt)" >> $GITHUB_OUTPUT
 
   build-32:
     runs-on: windows-2022
@@ -92,10 +98,12 @@ jobs:
           electron: 32
           os: ${{ runner.os }}
 
-      - name: Electron version
-        shell: bash
+      - name: Get latest Electron version for 32.0.0
         id: electron-version
-        run: echo "electron=32.2.6" >> $GITHUB_OUTPUT
+        shell: bash
+        run: |
+          node tools/getVersion.js 32
+          echo "electron=$(cat electron.txt)" >> $GITHUB_OUTPUT
 
   build-33:
     runs-on: windows-2022
@@ -114,10 +122,12 @@ jobs:
           electron: 33
           os: ${{ runner.os }}
 
-      - name: Electron version
-        shell: bash
+      - name: Get latest Electron version for 33.0.0
         id: electron-version
-        run: echo "electron=33.2.1" >> $GITHUB_OUTPUT
+        shell: bash
+        run: |
+          node tools/getVersion.js 33
+          echo "electron=$(cat electron.txt)" >> $GITHUB_OUTPUT
 
   test-29:
     strategy:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -31,43 +31,25 @@ env:
 
 jobs:
   build:
-    runs-on: ${{ matrix.os }}
+    runs-on: windows-2022
     outputs:
       test-version: ${{ steps.electron-test-version.outputs.test-version }}
     strategy:
-      # fail-fast: false
-      matrix:
-        os: [windows-2022]
+      fail-fast: true
 
-    name: build ${{ matrix.os }}-electron-${{ inputs.build-version }}
+    name: build electron-${{ inputs.build-version }}
     steps:
 
       - name: Checkout code
         uses: actions/checkout@v4
 
-      # - name: Resolve Electron version from major
-      #   id: electron-test-version
-      #   shell: bash
-      #   run: |
-      #       if [[ ${{ inputs.build-version }} == '29' ]]; then
-      #         echo "test-version=29.4.6" >> $GITHUB_OUTPUT
-      #       elif [[ ${{ inputs.build-version }} == '30' ]]; then
-      #         echo "test-version=30.5.1" >> $GITHUB_OUTPUT
-      #       elif [[ ${{ inputs.build-version }} == '31' ]]; then
-      #         echo "test-version=31.7.5" >> $GITHUB_OUTPUT
-      #       elif [[ ${{ inputs.build-version }} == '32' ]]; then
-      #         echo "test-version=32.2.6" >> $GITHUB_OUTPUT
-      #       elif [[ ${{ inputs.build-version }} == '33' ]]; then
-      #         echo "test-version=33.2.1" >> $GITHUB_OUTPUT
-      #       fi 
-
       - name: Setup env
         uses: ./.github/actions/setup-env
         with:
           electron: '${{ inputs.build-version }}.0.0'
-          os: ${{ matrix.os }}
-          
-      - name: Get latestElectron version for v${{ inputs.build-version }}
+          os: ${{ runner.os }}
+
+      - name: Get latest Electron version for ${{ inputs.build-version }}.0.0
         id: electron-test-version
         shell: bash
         run: |

diff --git a/src/double/Edge.js/Edge.js.csproj b/src/double/Edge.js/Edge.js.csproj
@@ -62,6 +62,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis" Version="4.9.2" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.2" />
   </ItemGroup>
 </Project>