Skip to content

Commit e44e2f5

Browse files
committed
wip test pr workflow
fix main branch reference
1 parent b14fd83 commit e44e2f5

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

.github/workflows/pr_testing.yaml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ name: 'PR Tests'
44
on:
55
push:
66
branches:
7-
- master
7+
- main
88
pull_request:
99
branches:
10-
- master
10+
- main
1111

1212
jobs:
1313
shellcheck:
@@ -20,21 +20,20 @@ jobs:
2020
run: shellcheck tasks/*.sh
2121

2222
test-install-task-on-ubuntu:
23-
runs-on: ubuntu-latest
23+
# Perforce hasn't yet released bolt on 24.04.
24+
runs-on: ubuntu-22.04
2425
needs: shellcheck
2526
steps:
2627
- uses: actions/checkout@v4
27-
# - name: Install dependencies
28-
# run: sudo apt wget
2928
- name: Install Bolt
3029
run: |-
31-
wget https://apt.puppet.com/puppet-tools-release-noble.deb
32-
sudo dpkg -i puppet-tools-release-noble.deb
30+
wget https://apt.puppet.com/puppet-tools-release-jammy.deb
31+
sudo dpkg -i puppet-tools-release-jammy.deb
3332
sudo apt update
3433
sudo apt install -y puppet-bolt
3534
- name: Install module dependencies
3635
run: bolt module install
3736
- name: Run openvox-agent install task
3837
run: bolt task run openvox_bootstrap::install --targets localhost
3938
- name: Verify openvox-agent is installed
40-
run: puppet --version
39+
run: test -n $(puppet --version)

tasks/install.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
}
2323
},
2424
"implementations": [
25-
{"name": "install_linux.sh", "requirements": ["shell"]}
25+
{
26+
"name": "install_linux.sh",
27+
"requirements": ["shell"],
28+
"files": ["facts/tasks/bash.sh"]
29+
}
2630
]
2731
}

tasks/install_linux.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ set_platform() {
6161
full_version=$(bash "${facts}" release)
6262
assigned 'full_version'
6363
else
64-
fail "Unable to find the puppetlabs-facts bash task to determine platform."
64+
fail "Unable to find the puppetlabs-facts bash task to determine platform at '${facts}'."
6565
fi
6666
}
6767

0 commit comments

Comments
 (0)