Skip to content

Commit 0a98c6e

Browse files
awalsh128awalsh128
committed
2 parents fe3d9d7 + 747a133 commit 0a98c6e

File tree

9 files changed

+117
-92
lines changed

9 files changed

+117
-92
lines changed

‎.github/workflows/debug.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
name: "Debug installation phase."
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v3 # Check out repo.
16+
- uses: actions/checkout@v3 # Check out repo.
1717
- name: "Run debug script before action execution."
1818
run: sudo ./devtools/debug/install_pre_action.sh
1919
shell: bash
20-
- name: Execute action.
20+
- name: Execute action.
2121
uses: awalsh128/cache-apt-pkgs-action@master
2222
with:
2323
packages: ${{ github.event.inputs.packages }}
@@ -36,11 +36,11 @@ jobs:
3636
needs: debug_install
3737
runs-on: ubuntu-latest
3838
steps:
39-
- uses: actions/checkout@v3 # Check out repo.
39+
- uses: actions/checkout@v3 # Check out repo.
4040
- name: Run debug script before action execution.
4141
run: sudo ./devtools/debug/restore_pre_action.sh
4242
shell: bash
43-
- name: Execute action.
43+
- name: Execute action.
4444
uses: awalsh128/cache-apt-pkgs-action@master
4545
with:
4646
packages: ${{ github.event.inputs.packages }}

‎.github/workflows/dev_test.yml‎

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ on:
1313

1414
env:
1515
DEBUG: ${{ github.event.inputs.debug || false }}
16+
# Test for overrides in built in shell options (regression issue 98).
17+
SHELLOPTS: errexit:pipefail
1618

1719
jobs:
1820
list_all_versions:
@@ -63,7 +65,7 @@ jobs:
6365
name: Standard workflow install package and cache.
6466
steps:
6567
- uses: actions/[email protected]
66-
- name: Execute
68+
- name: Execute
6769
id: execute
6870
uses: awalsh128/cache-apt-pkgs-action@dev
6971
with:
@@ -130,7 +132,8 @@ jobs:
130132
packages: rolldice xdot
131133
version: ${{ github.run_id }}-${{ github.run_attempt }}-standard_workflow
132134
debug: ${{ env.DEBUG }}
133-
- if: steps.execute.outputs.cache-hit != 'true'
135+
- name: Verify
136+
if: steps.execute.outputs.cache-hit != 'true'
134137
run: |
135138
echo "cache-hit = ${{ steps.execute.outputs.cache-hit }}"
136139
exit 1
@@ -149,7 +152,8 @@ jobs:
149152
packages: xdot rolldice distro-info-data
150153
version: ${{ github.run_id }}-${{ github.run_attempt }}-standard_workflow
151154
debug: ${{ env.DEBUG }}
152-
- if: steps.execute.outputs.cache-hit != 'false'
155+
- name: Verify
156+
if: steps.execute.outputs.cache-hit != 'false'
153157
run: |
154158
echo "cache-hit = ${{ steps.execute.outputs.cache-hit }}"
155159
exit 1
@@ -168,7 +172,8 @@ jobs:
168172
packages: xdot rolldice distro-info-data
169173
version: ${{ github.run_id }}-${{ github.run_attempt }}-standard_workflow
170174
debug: ${{ env.DEBUG }}
171-
- if: steps.execute.outputs.cache-hit != 'true'
175+
- name: Verify
176+
if: steps.execute.outputs.cache-hit != 'true'
172177
run: |
173178
echo "cache-hit = ${{ steps.execute.outputs.cache-hit }}"
174179
exit 1
@@ -289,7 +294,7 @@ jobs:
289294
sudo apt-get install -y opencl-headers ocl-icd-opencl-dev;
290295
sudo apt-get install -y libsundials-dev;
291296
- uses: awalsh128/cache-apt-pkgs-action@dev
292-
with:
297+
with:
293298
packages: intel-oneapi-runtime-libs
294299
version: ${{ github.run_id }}-${{ github.run_attempt }}-regression_76
295300
debug: ${{ env.DEBUG }}
@@ -345,7 +350,7 @@ jobs:
345350
- name: Verify
346351
if: steps.execute.outputs.cache-hit != 'true'
347352
run: |
348-
echo "cache-hit = ${{ steps.cache-apt-pkgs-backslash.outputs.cache-hit }}"
353+
echo "cache-hit = ${{ steps.execute.outputs.cache-hit }}"
349354
exit 1
350355
shell: bash
351356

@@ -393,36 +398,36 @@ jobs:
393398
version: ${{ github.run_id }}-${{ github.run_attempt }}-regression_89
394399
debug: true
395400

396-
regression_99:
401+
regression_98:
397402
runs-on: ubuntu-latest
398-
name: "Install package with backslashes in filepaths (regression issue #99)."
403+
name: "Install error due to SHELLOPTS override (regression issue #98)."
399404
steps:
400405
- uses: actions/[email protected]
401406
- uses: awalsh128/cache-apt-pkgs-action@dev
402407
with:
403-
packages: systemd=249.11-0ubuntu3.9
404-
version: ${{ github.run_id }}-${{ github.run_attempt }}-regression_99
408+
packages: git-restore-mtime libgl1-mesa-dev libosmesa6-dev pandoc
409+
version: ${{ github.run_id }}-${{ github.run_attempt }}-regression_98
405410
debug: true
406411

407-
regression_98:
412+
regression_106_install:
408413
runs-on: ubuntu-latest
409-
name: "Install error (regression issue #98)."
414+
name: "Stale apt repo not finding package on restore, install phase (regression issue #106)."
410415
steps:
411416
- uses: actions/[email protected]
412417
- uses: awalsh128/cache-apt-pkgs-action@dev
413418
with:
414-
packages: git-restore-mtime libgl1-mesa-dev libosmesa6-dev pandoc
415-
version: ${{ github.run_id }}-${{ github.run_attempt }}-regression_98
419+
packages: libtk8.6
420+
version: ${{ github.run_id }}-${{ github.run_attempt }}-regression_106
416421
debug: true
417422

418-
regression_98_2:
423+
regression_106_restore:
424+
needs: regression_106_install
419425
runs-on: ubuntu-latest
420-
name: "Install error (regression issue #98-2)."
426+
name: "Stale apt repo not finding package on restore, restore phase (regression issue #106)."
421427
steps:
422428
- uses: actions/[email protected]
423429
- uses: awalsh128/cache-apt-pkgs-action@dev
424430
with:
425-
packages: libgl1-mesa-glx xvfb
426-
version: ${{ github.run_id }}-${{ github.run_attempt }}-regression_98_2
431+
packages: libtk8.6
432+
version: ${{ github.run_id }}-${{ github.run_attempt }}-regression_106
427433
debug: true
428-

‎.github/workflows/master_test.yml‎

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ on:
1313

1414
env:
1515
DEBUG: ${{ github.event.inputs.debug || false }}
16+
# Test for overrides in built in shell options (regression issue 98).
17+
SHELLOPTS: errexit:pipefail
1618

1719
jobs:
1820
list_all_versions:
@@ -63,7 +65,7 @@ jobs:
6365
name: Standard workflow install package and cache.
6466
steps:
6567
- uses: actions/[email protected]
66-
- name: Execute
68+
- name: Execute
6769
id: execute
6870
uses: awalsh128/cache-apt-pkgs-action@master
6971
with:
@@ -130,7 +132,8 @@ jobs:
130132
packages: rolldice xdot
131133
version: ${{ github.run_id }}-${{ github.run_attempt }}-standard_workflow
132134
debug: ${{ env.DEBUG }}
133-
- if: steps.execute.outputs.cache-hit != 'true'
135+
- name: Verify
136+
if: steps.execute.outputs.cache-hit != 'true'
134137
run: |
135138
echo "cache-hit = ${{ steps.execute.outputs.cache-hit }}"
136139
exit 1
@@ -149,7 +152,8 @@ jobs:
149152
packages: xdot rolldice distro-info-data
150153
version: ${{ github.run_id }}-${{ github.run_attempt }}-standard_workflow
151154
debug: ${{ env.DEBUG }}
152-
- if: steps.execute.outputs.cache-hit != 'false'
155+
- name: Verify
156+
if: steps.execute.outputs.cache-hit != 'false'
153157
run: |
154158
echo "cache-hit = ${{ steps.execute.outputs.cache-hit }}"
155159
exit 1
@@ -168,7 +172,8 @@ jobs:
168172
packages: xdot rolldice distro-info-data
169173
version: ${{ github.run_id }}-${{ github.run_attempt }}-standard_workflow
170174
debug: ${{ env.DEBUG }}
171-
- if: steps.execute.outputs.cache-hit != 'true'
175+
- name: Verify
176+
if: steps.execute.outputs.cache-hit != 'true'
172177
run: |
173178
echo "cache-hit = ${{ steps.execute.outputs.cache-hit }}"
174179
exit 1
@@ -289,7 +294,7 @@ jobs:
289294
sudo apt-get install -y opencl-headers ocl-icd-opencl-dev;
290295
sudo apt-get install -y libsundials-dev;
291296
- uses: awalsh128/cache-apt-pkgs-action@master
292-
with:
297+
with:
293298
packages: intel-oneapi-runtime-libs
294299
version: ${{ github.run_id }}-${{ github.run_attempt }}-regression_76
295300
debug: ${{ env.DEBUG }}
@@ -345,7 +350,7 @@ jobs:
345350
- name: Verify
346351
if: steps.execute.outputs.cache-hit != 'true'
347352
run: |
348-
echo "cache-hit = ${{ steps.cache-apt-pkgs-backslash.outputs.cache-hit }}"
353+
echo "cache-hit = ${{ steps.execute.outputs.cache-hit }}"
349354
exit 1
350355
shell: bash
351356

@@ -393,36 +398,36 @@ jobs:
393398
version: ${{ github.run_id }}-${{ github.run_attempt }}-regression_89
394399
debug: true
395400

396-
regression_99:
401+
regression_98:
397402
runs-on: ubuntu-latest
398-
name: "Install package with backslashes in filepaths (regression issue #99)."
403+
name: "Install error due to SHELLOPTS override (regression issue #98)."
399404
steps:
400405
- uses: actions/[email protected]
401406
- uses: awalsh128/cache-apt-pkgs-action@master
402407
with:
403-
packages: systemd=249.11-0ubuntu3.9
404-
version: ${{ github.run_id }}-${{ github.run_attempt }}-regression_99
408+
packages: git-restore-mtime libgl1-mesa-dev libosmesa6-dev pandoc
409+
version: ${{ github.run_id }}-${{ github.run_attempt }}-regression_98
405410
debug: true
406411

407-
regression_98:
412+
regression_106_install:
408413
runs-on: ubuntu-latest
409-
name: "Install error (regression issue #98)."
414+
name: "Stale apt repo not finding package on restore, install phase (regression issue #106)."
410415
steps:
411416
- uses: actions/[email protected]
412417
- uses: awalsh128/cache-apt-pkgs-action@master
413418
with:
414-
packages: git-restore-mtime libgl1-mesa-dev libosmesa6-dev pandoc
415-
version: ${{ github.run_id }}-${{ github.run_attempt }}-regression_98
419+
packages: libtk8.6
420+
version: ${{ github.run_id }}-${{ github.run_attempt }}-regression_106
416421
debug: true
417422

418-
regression_98_2:
423+
regression_106_restore:
424+
needs: regression_106_install
419425
runs-on: ubuntu-latest
420-
name: "Install error (regression issue #98-2)."
426+
name: "Stale apt repo not finding package on restore, restore phase (regression issue #106)."
421427
steps:
422428
- uses: actions/[email protected]
423429
- uses: awalsh128/cache-apt-pkgs-action@master
424430
with:
425-
packages: libgl1-mesa-glx xvfb
426-
version: ${{ github.run_id }}-${{ github.run_attempt }}-regression_98_2
431+
packages: libtk8.6
432+
version: ${{ github.run_id }}-${{ github.run_attempt }}-regression_106
427433
debug: true
428-

‎.github/workflows/staging_test.yml‎

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ on:
1313

1414
env:
1515
DEBUG: ${{ github.event.inputs.debug || false }}
16+
# Test for overrides in built in shell options (regression issue 98).
17+
SHELLOPTS: errexit:pipefail
1618

1719
jobs:
1820
list_all_versions:
@@ -63,7 +65,7 @@ jobs:
6365
name: Standard workflow install package and cache.
6466
steps:
6567
- uses: actions/[email protected]
66-
- name: Execute
68+
- name: Execute
6769
id: execute
6870
uses: awalsh128/cache-apt-pkgs-action@staging
6971
with:
@@ -130,7 +132,8 @@ jobs:
130132
packages: rolldice xdot
131133
version: ${{ github.run_id }}-${{ github.run_attempt }}-standard_workflow
132134
debug: ${{ env.DEBUG }}
133-
- if: steps.execute.outputs.cache-hit != 'true'
135+
- name: Verify
136+
if: steps.execute.outputs.cache-hit != 'true'
134137
run: |
135138
echo "cache-hit = ${{ steps.execute.outputs.cache-hit }}"
136139
exit 1
@@ -149,7 +152,8 @@ jobs:
149152
packages: xdot rolldice distro-info-data
150153
version: ${{ github.run_id }}-${{ github.run_attempt }}-standard_workflow
151154
debug: ${{ env.DEBUG }}
152-
- if: steps.execute.outputs.cache-hit != 'false'
155+
- name: Verify
156+
if: steps.execute.outputs.cache-hit != 'false'
153157
run: |
154158
echo "cache-hit = ${{ steps.execute.outputs.cache-hit }}"
155159
exit 1
@@ -168,7 +172,8 @@ jobs:
168172
packages: xdot rolldice distro-info-data
169173
version: ${{ github.run_id }}-${{ github.run_attempt }}-standard_workflow
170174
debug: ${{ env.DEBUG }}
171-
- if: steps.execute.outputs.cache-hit != 'true'
175+
- name: Verify
176+
if: steps.execute.outputs.cache-hit != 'true'
172177
run: |
173178
echo "cache-hit = ${{ steps.execute.outputs.cache-hit }}"
174179
exit 1
@@ -289,7 +294,7 @@ jobs:
289294
sudo apt-get install -y opencl-headers ocl-icd-opencl-dev;
290295
sudo apt-get install -y libsundials-dev;
291296
- uses: awalsh128/cache-apt-pkgs-action@staging
292-
with:
297+
with:
293298
packages: intel-oneapi-runtime-libs
294299
version: ${{ github.run_id }}-${{ github.run_attempt }}-regression_76
295300
debug: ${{ env.DEBUG }}
@@ -345,7 +350,7 @@ jobs:
345350
- name: Verify
346351
if: steps.execute.outputs.cache-hit != 'true'
347352
run: |
348-
echo "cache-hit = ${{ steps.cache-apt-pkgs-backslash.outputs.cache-hit }}"
353+
echo "cache-hit = ${{ steps.execute.outputs.cache-hit }}"
349354
exit 1
350355
shell: bash
351356

@@ -393,36 +398,36 @@ jobs:
393398
version: ${{ github.run_id }}-${{ github.run_attempt }}-regression_89
394399
debug: true
395400

396-
regression_99:
401+
regression_98:
397402
runs-on: ubuntu-latest
398-
name: "Install package with backslashes in filepaths (regression issue #99)."
403+
name: "Install error due to SHELLOPTS override (regression issue #98)."
399404
steps:
400405
- uses: actions/[email protected]
401406
- uses: awalsh128/cache-apt-pkgs-action@staging
402407
with:
403-
packages: systemd=249.11-0ubuntu3.9
404-
version: ${{ github.run_id }}-${{ github.run_attempt }}-regression_99
408+
packages: git-restore-mtime libgl1-mesa-dev libosmesa6-dev pandoc
409+
version: ${{ github.run_id }}-${{ github.run_attempt }}-regression_98
405410
debug: true
406411

407-
regression_98:
412+
regression_106_install:
408413
runs-on: ubuntu-latest
409-
name: "Install error (regression issue #98)."
414+
name: "Stale apt repo not finding package on restore, install phase (regression issue #106)."
410415
steps:
411416
- uses: actions/[email protected]
412417
- uses: awalsh128/cache-apt-pkgs-action@staging
413418
with:
414-
packages: git-restore-mtime libgl1-mesa-dev libosmesa6-dev pandoc
415-
version: ${{ github.run_id }}-${{ github.run_attempt }}-regression_98
419+
packages: libtk8.6
420+
version: ${{ github.run_id }}-${{ github.run_attempt }}-regression_106
416421
debug: true
417422

418-
regression_98_2:
423+
regression_106_restore:
424+
needs: regression_106_install
419425
runs-on: ubuntu-latest
420-
name: "Install error (regression issue #98-2)."
426+
name: "Stale apt repo not finding package on restore, restore phase (regression issue #106)."
421427
steps:
422428
- uses: actions/[email protected]
423429
- uses: awalsh128/cache-apt-pkgs-action@staging
424430
with:
425-
packages: libgl1-mesa-glx xvfb
426-
version: ${{ github.run_id }}-${{ github.run_attempt }}-regression_98_2
431+
packages: libtk8.6
432+
version: ${{ github.run_id }}-${{ github.run_attempt }}-regression_106
427433
debug: true
428-

‎.github/workflows/update_release_tags.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Update Release Tags
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
version:
6+
description: "Version tag to update to."
7+
type: string
8+
required: true
9+
10+
jobs:
11+
update_release_tags:
12+
runs-on: ubuntu-latest
13+
name: Run update_release_tags.sh script.
14+
steps:
15+
- uses: actions/checkout@v3
16+
- run: ./devtools/update_release_tags.sh ${{ github.event.inputs.version }}

‎devtools/debug/install_post_action.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
#!/bin/bash
22

3-
dpkg -L libboost1.71-dev

0 commit comments

Comments
 (0)