Skip to content

Commit 14b43a1

Browse files
committed
github: fixup presubmit workflow
Bump epochs prior to building new packages, such that just rebuilt packages are tested later on. During apk installability tests, pass through the full registry of packages such that they can resolve any new dependants, when needed. This should fix CI when making invasive SCA changes.
1 parent a5d2847 commit 14b43a1

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

.github/workflows/wolfi-presubmit.yaml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,12 @@ jobs:
9393
sudo chmod a+x /usr/bin/melange
9494
melange version
9595
96+
# this need to point to main to always get the latest action
97+
- uses: wolfi-dev/actions/install-wolfictl@main # main
98+
99+
- run: |
100+
wolfictl bump ${{ matrix.package }}
101+
96102
- if: matrix.runner == 'bubblewrap'
97103
run: |
98104
sudo apt-get -y install bubblewrap
@@ -157,15 +163,12 @@ jobs:
157163
repository: "wolfi-dev/advisories"
158164
path: "data/wolfi-advisories"
159165

160-
# this need to point to main to always get the latest action
161-
- uses: wolfi-dev/actions/install-wolfictl@main # main
162-
163166
- name: Test installable and Scan for CVEs
164167
run: |
165168
if [[ "${{ matrix.package }}" == "fping" ]]; then
166-
docker run --rm -v $(pwd):/work --workdir /work cgr.dev/chainguard/wolfi-base /bin/sh -c "apk add --allow-untrusted packages/x86_64/${{ matrix.package }}-*.apk; apk add libcap-utils; getcap /usr/sbin/fping"
169+
docker run --rm -v $(pwd):/work --workdir /work cgr.dev/chainguard/wolfi-base /bin/sh -c "apk add --allow-untrusted -X ./packages/ packages/x86_64/${{ matrix.package }}-*.apk; apk add libcap-utils; getcap /usr/sbin/fping"
167170
else
168-
docker run --rm -v $(pwd):/work --workdir /work cgr.dev/chainguard/wolfi-base apk add --allow-untrusted packages/x86_64/${{ matrix.package }}-*.apk
171+
docker run --rm -v $(pwd):/work --workdir /work cgr.dev/chainguard/wolfi-base apk add --allow-untrusted -X ./packages/ packages/x86_64/${{ matrix.package }}-*.apk
169172
fi
170173
# There is a huge fixed cost for every wolfictl scan invocation for grype DB init.
171174
# Do this outside of the loop in one invocation with every package.

0 commit comments

Comments
 (0)