Skip to content

Commit 9f58eb6

Browse files
committed
ci: fix cache that was not aware of changes in ci scripts, add tag/commit to artifact name, add dir in tag
1 parent fc2f091 commit 9f58eb6

File tree

1 file changed

+18
-8
lines changed

1 file changed

+18
-8
lines changed

.github/workflows/main.yml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -95,27 +95,27 @@ jobs:
9595
id: cache-pyenv
9696
with:
9797
path: .pyenv
98-
key: pyenv-${{ env.PYENV_VERSION }}-python-${{ env.PYTHON_VERSION }}-${{ matrix.os }}
98+
key: pyenv-${{ env.PYENV_VERSION }}-python-${{ env.PYTHON_VERSION }}-${{ matrix.os }}-${{ hashFiles('scripts/ci/02-install-python.*') }}
9999

100100
- name: (GHO) Cache venv
101101
uses: actions/cache@v4.0.0
102102
id: cache-venv
103103
with:
104104
path: .venv
105-
key: venv-python-${{ env.PYTHON_VERSION }}-${{ hashFiles( format('{0}/rcm/client/requirements.txt', env.RCM_CHECKOUT ) ) }}-paramiko-${{ env.PARAMIKO_PULL }}-${{env.PARAMIKO_COMMIT}}-${{ matrix.os }}
105+
key: venv-python-${{ env.PYTHON_VERSION }}-paramiko-${{ env.PARAMIKO_PULL }}-${{env.PARAMIKO_COMMIT}}-${{ matrix.os }}-${{ hashFiles('scripts/ci/03-install-venv.*', '**/requirements.txt') }}
106106

107107
- name: (GHO) Cache turbovnc
108108
uses: actions/cache@v4.0.0
109109
id: cache-turbovnc
110110
with:
111111
path: ${{ env.RCM_CHECKOUT }}/${{ env.TURBOVNC_EXTERNAL }}
112-
key: turbovnc-${{ matrix.turbovnc-version }}-${{ matrix.os }}
112+
key: turbovnc-${{ matrix.turbovnc-version }}-${{ matrix.os }}-${{ hashFiles('scripts/ci/04*') }}
113113

114114
- name: (GHO) Cache step
115115
uses: actions/cache@v4.0.0
116116
id: cache-step
117117
with:
118-
path: ${{ env.RCM_CHECKOUT }}/${{ env.SMALLSTEP_EXTERNAL }}
118+
path: ${{ env.RCM_CHECKOUT }}/${{ env.SMALLSTEP_EXTERNAL }}-${{ hashFiles('scripts/ci/05*') }}
119119
key: step-${{ matrix.os }}
120120

121121
# PYTHON
@@ -170,7 +170,7 @@ jobs:
170170
with:
171171
linux: . "${RCM_CHECKOUT}/scripts/ci/05-extract-step-linux.sh"
172172
windows: . "${env:RCM_CHECKOUT}\scripts\ci\05-extract-step.ps1"
173-
173+
174174
# EXTERNAL PLINK
175175
- name: External plink (windows)
176176
uses: carlkidcrypto/os-specific-runner@v2.0.0
@@ -217,7 +217,17 @@ jobs:
217217
uses: svenstaro/upload-release-action@v2
218218
with:
219219
file: RCM${{ env.EXT }}
220-
asset_name: ${{ env.ARTIFACT_BASENAME }}${{ env.EXT }}
220+
asset_name: ${{ env.ARTIFACT_BASENAME }}-${{ github.ref_name }}${{ env.EXT }}
221+
prerelease: true
222+
overwrite: true
223+
tag: ${{ github.ref }}
224+
225+
- name: (GHO)(TAG) Upload exe to release
226+
if: ${{ github.event_name == 'push' && contains(github.ref, 'refs/tags/') }}
227+
uses: svenstaro/upload-release-action@v2
228+
with:
229+
file: RCM.zip
230+
asset_name: ${{ env.ARTIFACT_BASENAME }}-${{ github.ref_name }}.zip
221231
prerelease: true
222232
overwrite: true
223233
tag: ${{ github.ref }}
@@ -226,14 +236,14 @@ jobs:
226236
if: ${{ github.event_name != 'push' && !contains(github.ref, 'refs/tags/') }}
227237
uses: actions/upload-artifact@v4.3.1
228238
with:
229-
name: ${{ env.ARTIFACT_BASENAME }}
239+
name: ${{ env.ARTIFACT_BASENAME }}-${{ github.sha }}
230240
path: RCM${{ env.EXT }}
231241

232242
- name: (GHO) Upload artifact dir
233243
if: ${{ github.event_name != 'push' && !contains(github.ref, 'refs/tags/') }}
234244
uses: actions/upload-artifact@v4.3.1
235245
with:
236-
name: ${{ env.ARTIFACT_BASENAME }}-dir
246+
name: ${{ env.ARTIFACT_BASENAME }}-${{ github.sha }}-dir
237247
path: RCM.zip
238248

239249
- name: (Attestation) Verify RCM executable and zip

0 commit comments

Comments
 (0)