Skip to content

fix: Redundant test workflow #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phuongfi91 merged 7 commits into from
Dec 11, 2025
Merged

fix: Redundant test workflow #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
20b8e94
feat: Alternative unix power tools
phuongfi91 Dec 11, 2025
efb1f7a
feat: Add github workflow to run docker image test
phuongfi91 Dec 11, 2025
bc80b40
fix: Case when container-structure-test does not support --platform flag
phuongfi91 Dec 11, 2025
b239e89
Merge branch 'latest' into feat/phuongfi91/alt-unix-power-tools
phuongfi91 Dec 11, 2025
5518631
fix: Redundant test workflow
phuongfi91 Dec 11, 2025
cddbb85
fix: hadolint maybe has bad casing?
phuongfi91 Dec 11, 2025
1bd00d8
fix: maybe flaky test?
phuongfi91 Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions .github/workflows/publish.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,14 @@ jobs:

- name: Install container-structure-test
run: |
if [[ "${{ matrix.platform }}" == *"arm64"* ]]; then
curl -LO https://github.com/GoogleContainerTools/container-structure-test/releases/latest/download/container-structure-test-linux-arm64 && chmod +x container-structure-test-linux-arm64 && sudo mv container-structure-test-linux-arm64 /usr/local/bin/container-structure-test
else
curl -LO https://github.com/GoogleContainerTools/container-structure-test/releases/latest/download/container-structure-test-linux-amd64 && chmod +x container-structure-test-linux-amd64 && sudo mv container-structure-test-linux-amd64 /usr/local/bin/container-structure-test
fi
if [ "${{ matrix.platform }}" == "linux/arm64" ]; then
ARCH="arm64"
else
ARCH="amd64"
fi
curl -LO "https://storage.googleapis.com/container-structure-test/latest/container-structure-test-linux-${ARCH}"
chmod +x "container-structure-test-linux-${ARCH}"
sudo mv "container-structure-test-linux-${ARCH}" /usr/local/bin/container-structure-test

- name: Run tests
run: |
Expand Down
40 changes: 0 additions & 40 deletions .github/workflows/test.yaml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
&& export SHFMT_VERSION=$(curl -s https://api.github.com/repos/mvdan/sh/releases/latest | jq -r '.tag_name') \
&& if [ "$(uname -m)" = "aarch64" ]; then \
curl -o /usr/local/bin/snyk -L https://static.snyk.io/cli/latest/snyk-linux-arm64 \
&& curl -o /usr/local/bin/hadolint -L https://github.com/hadolint/hadolint/releases/download/${HADOLINT_VERSION}/hadolint-Linux-arm64 \
&& curl -o /usr/local/bin/hadolint -L https://github.com/hadolint/hadolint/releases/download/${HADOLINT_VERSION}/hadolint-linux-arm64 \
&& curl -o /usr/local/bin/shfmt -L https://github.com/mvdan/sh/releases/download/${SHFMT_VERSION}/shfmt_${SHFMT_VERSION}_linux_arm64 \
&& curl -sL "https://github.com/rhysd/actionlint/releases/download/v${ACTIONLINT_VERSION}/actionlint_${ACTIONLINT_VERSION}_linux_arm64.tar.gz" | tar -xzf - -C /usr/local/bin actionlint ; \
else \
curl -o /usr/local/bin/snyk -L https://static.snyk.io/cli/latest/snyk-linux \
&& curl -o /usr/local/bin/hadolint -L https://github.com/hadolint/hadolint/releases/download/${HADOLINT_VERSION}/hadolint-Linux-x86_64 \
&& curl -o /usr/local/bin/hadolint -L https://github.com/hadolint/hadolint/releases/download/${HADOLINT_VERSION}/hadolint-linux-x86_64 \
&& curl -o /usr/local/bin/shfmt -L https://github.com/mvdan/sh/releases/download/${SHFMT_VERSION}/shfmt_${SHFMT_VERSION}_linux_amd64 \
&& curl -sL "https://github.com/rhysd/actionlint/releases/download/v${ACTIONLINT_VERSION}/actionlint_${ACTIONLINT_VERSION}_linux_amd64.tar.gz" | tar -xzf - -C /usr/local/bin actionlint ; \
fi \
Expand Down
10 changes: 5 additions & 5 deletions test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,19 @@ build_and_test() {
docker run --platform "$platform" --rm "$TEST_PLATFORM_IMAGE" uname -m

# Conditionally add --platform flag
PLATFORM_ARG=""
PLATFORM_ARG=()
if [ -n "$PLATFORM_FLAG" ]; then
PLATFORM_ARG="--platform $platform"
PLATFORM_ARG=(--platform "$platform")
fi

if [ "$platform" == "linux/amd64" ]; then
container-structure-test test "$PLATFORM_ARG" --image "$TEST_PLATFORM_IMAGE" --config tests/amd64.yaml
container-structure-test test "${PLATFORM_ARG[@]}" --image "$TEST_PLATFORM_IMAGE" --config tests/amd64.yaml
else
container-structure-test test "$PLATFORM_ARG" --image "$TEST_PLATFORM_IMAGE" --config tests/arm64.yaml
container-structure-test test "${PLATFORM_ARG[@]}" --image "$TEST_PLATFORM_IMAGE" --config tests/arm64.yaml
fi

# Run the tests
container-structure-test test "$PLATFORM_ARG" --image "$TEST_PLATFORM_IMAGE" --config tests/specs.yaml
container-structure-test test "${PLATFORM_ARG[@]}" --image "$TEST_PLATFORM_IMAGE" --config tests/specs.yaml

# Clean up
docker rmi $TEST_IMAGE:"$tag" || true
Expand Down