@@ -36,35 +36,36 @@ jobs:
3636 with :
3737 dir : ${{ github.repository }}
3838 upload-sbom-release-assets : true
39- setup :
40- runs-on : ubuntu-22.04
41- outputs :
42- NODE_VERSION : ${{ steps.set-versions.outputs.NODE_VERSION }}
43- ELECTRON_VERSION : ${{ steps.set-versions.outputs.ELECTRON_VERSION }}
44- LIBCURL_RELEASE : ${{ steps.set-versions.outputs.LIBCURL_RELEASE }}
45- LATEST_LIBCURL_RELEASE : ${{ steps.set-versions.outputs.LATEST_LIBCURL_RELEASE }}
46- NODE_LIBCURL_CPP_STD : ${{ steps.set-versions.outputs.NODE_LIBCURL_CPP_STD }}
47- npm_config_target : ${{ steps.set-versions.outputs.npm_config_target }}
48- steps :
49- - name : Checkout
50- uses : actions/checkout@v4
51-
52- - name : Read .node-version
53- id : set-versions
54- run : |
55- NODE_VERSION=$(cat .node-version)
56- ELECTRON_VERSION=$(cat .electron-version)
57- LIBCURL_RELEASE=$(cat .libcurl-version)
58- LATEST_LIBCURL_RELEASE=$(cat .libcurl-version)
59- NODE_LIBCURL_CPP_STD=c++20
60- npm_config_target=$(cat .electron-version)
61- echo "NODE_VERSION=$NODE_VERSION" >> $GITHUB_OUTPUT
62- echo "ELECTRON_VERSION=$ELECTRON_VERSION" >> $GITHUB_OUTPUT
63- echo "LIBCURL_RELEASE=$LIBCURL_RELEASE" >> $GITHUB_OUTPUT
64- echo "LATEST_LIBCURL_RELEASE=$LATEST_LIBCURL_RELEASE" >> $GITHUB_OUTPUT
65- echo "NODE_LIBCURL_CPP_STD=$NODE_LIBCURL_CPP_STD" >> $GITHUB_OUTPUT
66- echo "npm_config_target=$npm_config_target" >> $GITHUB_OUTPUT
67-
39+
40+ setup :
41+ runs-on : ubuntu-22.04
42+ outputs :
43+ NODE_VERSION : ${{ steps.set-versions.outputs.NODE_VERSION }}
44+ ELECTRON_VERSION : ${{ steps.set-versions.outputs.ELECTRON_VERSION }}
45+ LIBCURL_RELEASE : ${{ steps.set-versions.outputs.LIBCURL_RELEASE }}
46+ LATEST_LIBCURL_RELEASE : ${{ steps.set-versions.outputs.LATEST_LIBCURL_RELEASE }}
47+ NODE_LIBCURL_CPP_STD : ${{ steps.set-versions.outputs.NODE_LIBCURL_CPP_STD }}
48+ npm_config_target : ${{ steps.set-versions.outputs.npm_config_target }}
49+ steps :
50+ - name : Checkout
51+ uses : actions/checkout@v4
52+
53+ - name : Read .node-version
54+ id : set-versions
55+ run : |
56+ NODE_VERSION=$(cat .node-version)
57+ ELECTRON_VERSION=$(cat .electron-version)
58+ LIBCURL_RELEASE=$(cat .libcurl-version)
59+ LATEST_LIBCURL_RELEASE=$(cat .libcurl-version)
60+ NODE_LIBCURL_CPP_STD=c++20
61+ npm_config_target=$(cat .electron-version)
62+ echo "NODE_VERSION=$NODE_VERSION" >> $GITHUB_OUTPUT
63+ echo "ELECTRON_VERSION=$ELECTRON_VERSION" >> $GITHUB_OUTPUT
64+ echo "LIBCURL_RELEASE=$LIBCURL_RELEASE" >> $GITHUB_OUTPUT
65+ echo "LATEST_LIBCURL_RELEASE=$LATEST_LIBCURL_RELEASE" >> $GITHUB_OUTPUT
66+ echo "NODE_LIBCURL_CPP_STD=$NODE_LIBCURL_CPP_STD" >> $GITHUB_OUTPUT
67+ echo "npm_config_target=$npm_config_target" >> $GITHUB_OUTPUT
68+
6869 build-and-release-nodejs :
6970 needs : setup
7071 permissions : write-all
@@ -120,7 +121,7 @@ jobs:
120121 if : always()
121122 uses : actions/upload-artifact@v4
122123 with :
123- name : build-logs-${{ matrix.os }}-${{ env.LIBCURL_VERSION }}-${{ env.NODE_VERSION }}
124+ name : build-logs-${{ matrix.os }}-${{ env.LIBCURL_RELEASE }}-${{ env.NODE_VERSION }}
124125 path : ./logs/
125126 retention-days : 5
126127
@@ -187,7 +188,7 @@ jobs:
187188 if : always()
188189 uses : actions/upload-artifact@v4
189190 with :
190- name : build-logs-${{ matrix.os }}-${{ env.LIBCURL_VERSION }}-${{ env.ELECTRON_VERSION }} }}
191+ name : build-logs-${{ matrix.os }}-${{ env.LIBCURL_RELEASE }}-${{ env.ELECTRON_VERSION }} }}
191192 path : ./logs/
192193 retention-days : 5
193194
@@ -244,7 +245,7 @@ jobs:
244245 npm_config_build_from_source : true
245246 npm_config_runtime : ' electron'
246247 npm_config_dist_url : ' https://electronjs.org/headers'
247- env :
248+ npm_config_target : ${{ needs.setup.outputs.npm_config_target }}
248249 NODE_VERSION : ${{ needs.setup.outputs.NODE_VERSION }}
249250 ELECTRON_VERSION : ${{ needs.setup.outputs.ELECTRON_VERSION }}
250251 LIBCURL_RELEASE : ${{ needs.setup.outputs.LIBCURL_RELEASE }}
0 commit comments