Skip to content

Commit 491ff5b

Browse files
paketo-botpaketo-bot
committed
Updating github-config
1 parent f9c2a24 commit 491ff5b

3 files changed

Lines changed: 36 additions & 36 deletions

File tree

‎.github/workflows/create-release.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Create Release
22

33
on:
44
schedule:
5-
- cron: '27 2,14 * * *' # daily at 02:27 and 14:27 UTC
5+
- cron: '27 2,14 * * *' # daily at 02:27 and 14:27 UTC
66
push:
77
branches:
88
- main
@@ -463,7 +463,7 @@ jobs:
463463
- name: Get current run image hash code of ${{ matrix.stacks.name }} stack with arch ${{ matrix.arch.name }}
464464
run: |
465465
skopeo inspect --format "{{.Digest}}" ${{ matrix.stacks.base_run_container_image }} > ./hash-code-current-run-image-${{ matrix.arch.name }}-${{ matrix.stacks.name }}
466-
466+
467467
- name: Create empty image hash codes
468468
run: |
469469
if [ ! -f "./hash-code-current-build-image-${{ matrix.arch.name }}-${{ matrix.stacks.name }}" ]; then
@@ -478,7 +478,7 @@ jobs:
478478
with:
479479
name: hash-code-current-run-image-${{ matrix.arch.name }}-${{ matrix.stacks.name }}
480480
path: hash-code-current-run-image-${{ matrix.arch.name }}-${{ matrix.stacks.name }}
481-
if-no-files-found: error
481+
if-no-files-found: error
482482

483483
- name: Upload build image hash code
484484
if: ${{ matrix.stacks.create_build_image == true }}
@@ -508,11 +508,11 @@ jobs:
508508
name: Determine If Stack Files Changed
509509
runs-on: ubuntu-22.04
510510
needs: [ preparation, poll_usns, poll_images ]
511-
if: ${{
511+
if: ${{
512512
!failure() && !cancelled() &&
513513
!(
514-
(needs.poll_images.outputs.images_need_update == null &&
515-
needs.poll_usns.outputs.usns == null ) &&
514+
(needs.poll_images.outputs.images_need_update == null &&
515+
needs.poll_usns.outputs.usns == null ) &&
516516
github.event_name == 'schedule'
517517
) }}
518518
outputs:
@@ -541,7 +541,7 @@ jobs:
541541
usns_or_sha_changed:
542542
name: USNs or SHAs have changed
543543
runs-on: ubuntu-22.04
544-
outputs:
544+
outputs:
545545
changed: ${{ steps.usns_or_sha_changed.outputs.changed }}
546546
needs: [ preparation, poll_usns, poll_images ]
547547
if: ${{ !failure() && !cancelled() }}
@@ -626,14 +626,14 @@ jobs:
626626
with:
627627
name: current-build-receipt-${{ matrix.stacks.name }}
628628
path: "*current-build-receipt-${{ matrix.stacks.name }}"
629-
if-no-files-found: error
629+
if-no-files-found: error
630630

631631
- name: Upload Run receipt
632632
uses: actions/upload-artifact@v4
633633
with:
634634
name: current-run-receipt-${{ matrix.stacks.name }}
635635
path: "*current-run-receipt-${{ matrix.stacks.name }}"
636-
if-no-files-found: error
636+
if-no-files-found: error
637637

638638
diff:
639639
name: Diff Packages
@@ -823,7 +823,7 @@ jobs:
823823
with:
824824
name: diff-${{ matrix.arch.name }}-${{ matrix.stacks.name }}
825825
path: diff-${{ matrix.arch.name }}-${{ matrix.stacks.name }}
826-
if-no-files-found: error
826+
if-no-files-found: error
827827

828828
- name: Download USN File(s)
829829
if: ${{ needs.preparation.outputs.polling_type == 'usn' }}
@@ -886,7 +886,7 @@ jobs:
886886
fi
887887
888888
if [ "${{ matrix.stacks.create_build_image }}" != "true" ]; then
889-
build_image=""
889+
build_image=""
890890
fi
891891
892892
echo "build_image=${build_image}" >> "$GITHUB_OUTPUT"
@@ -929,7 +929,7 @@ jobs:
929929
- name: Download diff-${{ matrix.arch.name }}-${{ matrix.stacks.name }}
930930
uses: actions/download-artifact@v4
931931
with:
932-
name: diff-${{ matrix.arch.name }}-${{ matrix.stacks.name }}
932+
name: diff-${{ matrix.arch.name }}-${{ matrix.stacks.name }}
933933

934934
- name: Compare With Previous Release
935935
id: compare
@@ -955,7 +955,7 @@ jobs:
955955
956956
if [ "${build_added:-0}" -eq 0 ] && [ "${build_modified:-0}" -eq 0 ] && [ "${run_added}" -eq 0 ] && [ "${run_modified}" -eq 0 ]; then
957957
echo "No packages changed."
958-
# We ommit setting "packages_changed" variable to false,
958+
# We ommit setting "packages_changed" variable to false,
959959
# as there is an edge case scenario overriding any true value due to parallelization
960960
else
961961
echo "Packages changed."
@@ -1230,7 +1230,7 @@ jobs:
12301230
'. += [
12311231
{
12321232
"path": ($hash_code_filepath + "/" + "hash-code-current-build-image-"+ $arch + "-" + $stack_name ),
1233-
"name": ($asset_prefix + "-" + $arch_prefix + $build_image + ".oci.sha256"),
1233+
"name": ($asset_prefix + $arch_prefix + $build_image + ".oci.sha256"),
12341234
"content_type": "text/plain"
12351235
}
12361236
]' <<<"${assets}")"

‎.github/workflows/test-pull-request.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ on:
88
jobs:
99
test:
1010
name: Acceptance Test
11-
runs-on: ubuntu-22.04
11+
runs-on: ubuntu-24.04
1212
steps:
1313
- name: Setup Go
1414
uses: actions/setup-go@v3
1515
with:
16-
go-version: stable
16+
go-version: 'stable'
1717

1818
- name: Checkout
1919
uses: actions/checkout@v3
2020

2121
# https://github.com/docker/setup-qemu-action
2222
- name: Set up QEMU
23-
uses: docker/setup-qemu-action@v1
23+
uses: docker/setup-qemu-action@v3
2424

2525
- name: Create stack
2626
id: create-stack
@@ -32,7 +32,7 @@ jobs:
3232

3333
upload:
3434
name: Upload Workflow Event Payload
35-
runs-on: ubuntu-22.04
35+
runs-on: ubuntu-24.04
3636
steps:
3737
- name: Upload Artifact
3838
uses: actions/upload-artifact@v4

‎scripts/test.sh‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
set -eu
44
set -o pipefail
55

6-
readonly PROG_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
7-
readonly STACK_DIR="$(cd "${PROG_DIR}/.." && pwd)"
8-
readonly STACK_IMAGES_JSON_PATH="${STACK_DIR}/images.json"
9-
readonly INTEGRATION_JSON="${STACK_DIR}/integration.json"
6+
readonly SCRIPTS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
7+
readonly ROOT_DIR="$(cd "${SCRIPTS_DIR}/.." && pwd)"
8+
readonly STACK_IMAGES_JSON_PATH="${ROOT_DIR}/images.json"
9+
readonly INTEGRATION_JSON="${ROOT_DIR}/integration.json"
1010
declare STACK_IMAGES
1111

1212
# shellcheck source=SCRIPTDIR/.util/tools.sh
13-
source "${PROG_DIR}/.util/tools.sh"
13+
source "${SCRIPTS_DIR}/.util/tools.sh"
1414

1515
# shellcheck source=SCRIPTDIR/.util/print.sh
16-
source "${PROG_DIR}/.util/print.sh"
16+
source "${SCRIPTS_DIR}/.util/print.sh"
1717

1818
function main() {
1919
local clean token test_only_stacks validate_stack_builds
@@ -118,7 +118,7 @@ function main() {
118118
while read -r image; do
119119
config_dir=$(echo "${image}" | jq -r '.config_dir')
120120
output_dir=$(echo "${image}" | jq -r '.output_dir')
121-
"${STACK_DIR}/scripts/create.sh" \
121+
"${ROOT_DIR}/scripts/create.sh" \
122122
--stack-dir "${config_dir}" \
123123
--build-dir "${output_dir}"
124124
done <<<"$STACK_IMAGES"
@@ -162,10 +162,10 @@ function usage() {
162162
run_image=$(echo "${image}" | jq -r '.run_image')
163163

164164
if [ $create_build_image == 'true' ]; then
165-
oci_images_arr+=("${STACK_DIR}/${output_dir}/${build_image}.oci")
165+
oci_images_arr+=("${ROOT_DIR}/${output_dir}/${build_image}.oci")
166166
fi
167167

168-
oci_images_arr+=("${STACK_DIR}/${output_dir}/${run_image}.oci")
168+
oci_images_arr+=("${ROOT_DIR}/${output_dir}/${run_image}.oci")
169169

170170
done <<<"$STACK_IMAGES"
171171

@@ -192,27 +192,27 @@ function tools::install() {
192192
token="${1}"
193193

194194
util::tools::jam::install \
195-
--directory "${STACK_DIR}/.bin" \
195+
--directory "${ROOT_DIR}/.bin" \
196196
--token "${token}"
197197

198198
util::tools::pack::install \
199-
--directory "${STACK_DIR}/.bin" \
199+
--directory "${ROOT_DIR}/.bin" \
200200
--token "${token}"
201201

202202
util::tools::skopeo::check
203203

204204
util::tools::crane::install \
205-
--directory "${STACK_DIR}/.bin" \
205+
--directory "${ROOT_DIR}/.bin" \
206206
--token "${token}"
207207
}
208208

209209
function tests::run() {
210210
util::print::title "Run Stack Acceptance Tests"
211211

212212
export CGO_ENABLED=0
213-
export JAM_PATH="${STACK_DIR}/.bin/jam"
213+
export JAM_PATH="${ROOT_DIR}/.bin/jam"
214214
testout=$(mktemp)
215-
pushd "${STACK_DIR}" > /dev/null
215+
pushd "${ROOT_DIR}" > /dev/null
216216
if GOMAXPROCS="${GOMAXPROCS:-4}" go test -count=1 -timeout 0 ./... -v -run Acceptance | tee "${testout}"; then
217217
util::tools::tests::checkfocus "${testout}"
218218
util::print::success "** GO Test Succeeded **"
@@ -230,10 +230,10 @@ function stack_builds_exist() {
230230
stack_output_dir=$(echo "${image}" | jq -r '.output_dir')
231231
is_build_image_necessary=$(echo "${image}" | jq -r '.create_build_image // false')
232232

233-
if ! [[ -f "${STACK_DIR}/${stack_output_dir}/run.oci" ]]; then
233+
if ! [[ -f "${ROOT_DIR}/${stack_output_dir}/run.oci" ]]; then
234234
stack_output_builds_exist="false"
235235
fi
236-
if [[ ! -f "${STACK_DIR}/${stack_output_dir}/build.oci" && "${is_build_image_necessary}" == true ]]; then
236+
if [[ ! -f "${ROOT_DIR}/${stack_output_dir}/build.oci" && "${is_build_image_necessary}" == true ]]; then
237237
stack_output_builds_exist="false"
238238
fi
239239
done <<<"$STACK_IMAGES"
@@ -244,8 +244,8 @@ function stack_builds_exist() {
244244
function clean::stacks(){
245245
while read -r image; do
246246
output_dir=$(echo "${image}" | jq -r '.output_dir')
247-
rm -rf "${STACK_DIR}/${output_dir}"
247+
rm -rf "${ROOT_DIR}/${output_dir}"
248248
done <<<"$STACK_IMAGES"
249249
}
250250

251-
main "${@:-}"
251+
main "${@:-}"

0 commit comments

Comments
 (0)