Skip to content

Commit f10d56a

Browse files
GiuncanGiuncan
committed
Merge branch 'feature/workflow-update' into dev
2 parents 3c974d6 + 2f0135e commit f10d56a

2 files changed

Lines changed: 29 additions & 21 deletions

File tree

‎.github/workflows/main.yml‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
strategy:
2626
matrix:
2727
os:
28+
- windows-2025
2829
- windows-2022
2930
- ubuntu-24.04
3031
- ubuntu-22.04
31-
- ubuntu-20.04
3232
turbovnc-version:
3333
- "3.1"
3434
# - "2.2.7"
@@ -37,6 +37,8 @@ jobs:
3737
turbovnc-version: "none"
3838
- os: macos-14
3939
turbovnc-version: "none"
40+
- os: macos-15
41+
turbovnc-version: "none"
4042

4143
# The type of runner that the job will run on
4244
runs-on: ${{ matrix.os }}
@@ -56,10 +58,10 @@ jobs:
5658

5759
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
5860
- name: Checkout RCM
59-
uses: actions/checkout@v4.1.1
61+
uses: actions/checkout@v4.2.2
6062

6163
- name: Setup environment from yaml
62-
uses: carlkidcrypto/os-specific-runner@v2.0.0
64+
uses: carlkidcrypto/os-specific-runner@v2.1.2
6365
with:
6466
macos: |
6567
sed "s/- //;s/: /=/;s/=[\"']/=/;s/[\"']$//" "${{ env.RCM_CHECKOUT }}/scripts/ci/common_vars.yaml" | grep -v "^#" >> "${GITHUB_ENV}"
@@ -80,7 +82,7 @@ jobs:
8082
# CI VARIABLES
8183
# ======================================================================
8284
- name: Define platform
83-
uses: carlkidcrypto/os-specific-runner@v2.0.0
85+
uses: carlkidcrypto/os-specific-runner@v2.1.2
8486
env:
8587
RUNNER_ARCH: ${{ runner.arch }}
8688
with:
@@ -111,28 +113,28 @@ jobs:
111113
# CACHE
112114
# ======================================================================
113115
- name: (GHO) Cache pyenv
114-
uses: actions/cache@v4.0.0
116+
uses: actions/cache@v4.2.3
115117
id: cache-pyenv
116118
with:
117119
path: .pyenv
118120
key: pyenv-${{ env.PYENV_VERSION }}-python-${{ env.PYTHON_VERSION }}-${{ matrix.os }}-${{ hashFiles('scripts/ci/02-install-python.*') }}
119121

120122
- name: (GHO) Cache venv
121-
uses: actions/cache@v4.0.0
123+
uses: actions/cache@v4.2.3
122124
id: cache-venv
123125
with:
124126
path: .venv
125127
key: venv-python-${{ env.PYTHON_VERSION }}-paramiko-${{ env.PARAMIKO_PULL }}-${{env.PARAMIKO_COMMIT}}-${{ matrix.os }}-${{ hashFiles('scripts/ci/03-install-venv.*', '**/requirements.txt') }}
126128

127129
- name: (GHO) Cache turbovnc
128-
uses: actions/cache@v4.0.0
130+
uses: actions/cache@v4.2.3
129131
id: cache-turbovnc
130132
with:
131133
path: ${{ env.RCM_CHECKOUT }}/${{ env.TURBOVNC_EXTERNAL }}
132134
key: turbovnc-${{ matrix.turbovnc-version }}-${{ matrix.os }}-${{ hashFiles('scripts/ci/04*') }}
133135

134136
- name: (GHO) Cache step
135-
uses: actions/cache@v4.0.0
137+
uses: actions/cache@v4.2.3
136138
id: cache-step
137139
with:
138140
path: ${{ env.RCM_CHECKOUT }}/${{ env.SMALLSTEP_EXTERNAL }}-${{ hashFiles('scripts/ci/05*') }}
@@ -144,23 +146,23 @@ jobs:
144146

145147
# PYTHON
146148
- name: Setup pyenv environment
147-
uses: carlkidcrypto/os-specific-runner@v2.0.0
149+
uses: carlkidcrypto/os-specific-runner@v2.1.2
148150
with:
149151
macos: . "${RCM_CHECKOUT}/scripts/ci/01-setup-pyenv.sh"
150152
linux: . "${RCM_CHECKOUT}/scripts/ci/01-setup-pyenv.sh"
151153
windows: . "${env:RCM_CHECKOUT}\scripts\ci\01-setup-pyenv.ps1"
152154

153155
- name: Install pyenv locally
154156
if: ${{steps.cache-pyenv.outputs.cache-hit != 'true' }}
155-
uses: carlkidcrypto/os-specific-runner@v2.0.0
157+
uses: carlkidcrypto/os-specific-runner@v2.1.2
156158
with:
157159
macos: . "${RCM_CHECKOUT}/scripts/ci/02-install-python.sh"
158160
linux: . "${RCM_CHECKOUT}/scripts/ci/02-install-python.sh"
159161
windows: . "${env:RCM_CHECKOUT}\scripts\ci\02-install-python.ps1"
160162

161163
# VENV
162164
- name: Install venv
163-
uses: carlkidcrypto/os-specific-runner@v2.0.0
165+
uses: carlkidcrypto/os-specific-runner@v2.1.2
164166
if: ${{ steps.cache-venv.outputs.cache-hit != 'true' }}
165167
with:
166168
macos: . "${RCM_CHECKOUT}/scripts/ci/03-install-venv.sh"
@@ -169,7 +171,7 @@ jobs:
169171

170172
# TURBOVNC
171173
- name: Extract TurboVNC
172-
uses: carlkidcrypto/os-specific-runner@v2.0.0
174+
uses: carlkidcrypto/os-specific-runner@v2.1.2
173175
if: ${{ steps.cache-turbovnc.outputs.cache-hit != 'true' }}
174176
env:
175177
TURBOVNC_VERSION: ${{ matrix.turbovnc-version }}
@@ -178,7 +180,7 @@ jobs:
178180
windows: . "${env:RCM_CHECKOUT}\scripts\ci\04a-extract-turbovnc.ps1"
179181

180182
- name: Patch TurboVNC 3.x
181-
uses: carlkidcrypto/os-specific-runner@v2.0.0
183+
uses: carlkidcrypto/os-specific-runner@v2.1.2
182184
if: ${{ steps.cache-turbovnc.outputs.cache-hit != 'true' && startsWith(matrix.turbovnc-version, '3') }}
183185
env:
184186
ORIG_LINE: "jdk.tls.disabledAlgorithms=SSLv3, TLSv1, TLSv1.1, RC4, DES, MD5withRSA,"
@@ -189,23 +191,23 @@ jobs:
189191

190192
# EXTERNAL STEP
191193
- name: External step
192-
uses: carlkidcrypto/os-specific-runner@v2.0.0
194+
uses: carlkidcrypto/os-specific-runner@v2.1.2
193195
if: ${{ steps.cache-step.outputs.cache-hit != 'true' }}
194196
with:
195197
linux: . "${RCM_CHECKOUT}/scripts/ci/05-extract-step-linux.sh"
196198
windows: . "${env:RCM_CHECKOUT}\scripts\ci\05-extract-step.ps1"
197199

198200
# EXTERNAL PLINK
199201
- name: External plink (windows)
200-
uses: carlkidcrypto/os-specific-runner@v2.0.0
202+
uses: carlkidcrypto/os-specific-runner@v2.1.2
201203
with:
202204
windows: . "${env:RCM_CHECKOUT}\scripts\ci\06-download-plink.ps1"
203205

204206
# ======================================================================
205207
# PYINSTALLER
206208
# ======================================================================
207209
- name: Build pyinstaller
208-
uses: carlkidcrypto/os-specific-runner@v2.0.0
210+
uses: carlkidcrypto/os-specific-runner@v2.1.2
209211
with:
210212
macos: |
211213
source .venv/bin/activate
@@ -252,27 +254,27 @@ jobs:
252254
# CI ARTIFACT
253255
- name: (GHO) Upload artifact exe
254256
if: ${{ github.event_name != 'push' && !contains(github.ref, 'refs/tags/') }}
255-
uses: actions/upload-artifact@v4.3.1
257+
uses: actions/upload-artifact@v4.6.2
256258
with:
257259
name: ${{ env.ARTIFACT_BASENAME }}--${{ env.ARTIFACT_VERSION }}
258260
path: RCM${{ env.EXT }}
259261

260262
- name: (GHO) Upload artifact dir
261263
if: ${{ github.event_name != 'push' && !contains(github.ref, 'refs/tags/') }}
262-
uses: actions/upload-artifact@v4.3.1
264+
uses: actions/upload-artifact@v4.6.2
263265
with:
264266
name: ${{ env.ARTIFACT_BASENAME }}--${{ env.ARTIFACT_VERSION }}-dir
265267
path: RCM.zip
266268

267269
# ATTESTATION
268270
- name: (Attestation) Attest RCM executable
269-
uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
271+
uses: actions/attest-build-provenance@v2.4.0
270272
with:
271273
subject-path: RCM${{ env.EXT }}
272274
subject-name: ${{ env.ARTIFACT_BASENAME }}--${{ env.ARTIFACT_VERSION }}
273275

274276
- name: (Attestation) Attest RCM zip
275-
uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
277+
uses: actions/attest-build-provenance@v2.4.0
276278
with:
277279
subject-path: RCM.zip
278280
subject-name: ${{ env.ARTIFACT_BASENAME }}--${{ env.ARTIFACT_VERSION }}-dir

‎scripts/ci/02-install-python.sh‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,10 @@
33
if [ ! -d "${PYENV_ROOT:?}" ]; then
44
git clone -b "v${PYENV_VERSION:?}" "https://github.com/pyenv/pyenv.git" "${PYENV_ROOT:?}"
55
fi
6-
pyenv install -s "${PYTHON_VERSION:?}"
6+
7+
# https://github.com/pyenv/pyenv/issues/3211
8+
if [[ $( sw_vers -productVersion 2>/dev/null ) == 15.* ]]; then
9+
export PYTHON_BUILD_HOMEBREW_OPENSSL_FORMULA="openssl@3"
10+
fi
11+
12+
pyenv install -s "${PYTHON_VERSION:?}"

0 commit comments

Comments
 (0)