From 33332114a35c0ef144042642d2bfaac6919bcc1a Mon Sep 17 00:00:00 2001 From: Yashodhan Joshi Date: Fri, 4 Aug 2023 19:14:18 +0530 Subject: [PATCH] remove extra build flags from skopeo build --- .github/workflows/podman_tests.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/podman_tests.yaml b/.github/workflows/podman_tests.yaml index 3cfbacb6f..363c87a57 100644 --- a/.github/workflows/podman_tests.yaml +++ b/.github/workflows/podman_tests.yaml @@ -14,21 +14,24 @@ jobs: uses: taiki-e/install-action@just - name: Install requirements run: sudo env PATH=$PATH just ci-prepare + - name: Install skopeo and podman requirements + run: sudo apt-get install -y pkg-config libsystemd-dev libdbus-glib-1-dev libelf-dev libseccomp-dev libgpgme-dev bats - uses: actions/setup-go@v4 with: go-version: '1.20' - name: Download skopeo 1.13.1 source # because ubuntu 22.04 does not have latest, and podman tests depend on that run: mkdir /tmp/skopeo && curl -fsSL "https://github.com/containers/skopeo/archive/v1.13.1.tar.gz" | tar -xzf - -C /tmp/skopeo --strip-components=1 - name: Build skopeo - run: cd /tmp/skopeo && CGO_ENABLED=0 DISABLE_DOCS=1 make BUILDTAGS=containers_image_openpgp GO_DYN_FLAGS= + run: cd /tmp/skopeo && DISABLE_DOCS=1 make + - name: temp skopeo copy test + run: sudo skopeo copy --preserve-digests docker://quay.io/libpod/testimage:20221018 oci-archive:/tmp/podman-systest-imagecache-0/quay.io--libpod--testimage--20221018.tar && \ + sudo skopeo copy --all oci-archive:/tmp/podman-systest-imagecache-0/quay.io--libpod--testimage--20221018.tar containers-storage:quay.io/libpod/testimage:20221018 - name: copy skopeo binaries run: sudo cp /tmp/skopeo/bin/skopeo /usr/local/bin/skopeo && sudo cp /tmp/skopeo/default-policy.json /etc/containers/policy.json - name: Skopeo version run: skopeo --version - run: just youki-dev - run: sudo cp youki /usr/local/bin - - name: Install requirements for Podman - run: sudo apt-get install -y pkg-config libsystemd-dev libdbus-glib-1-dev libelf-dev libseccomp-dev libgpgme-dev bats skopeo - name: Clone podman repository uses: actions/checkout@v3 with: