diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 370751d6394..e5eb12a7fd9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,10 +28,10 @@ jobs: race: ["-race", ""] criu: ["", "criu-dev"] exclude: - - criu: "criu-dev" - rootless: "rootless" - os: "ubuntu-22.04" - go-version: "1.20.x" + - criu: criu-dev + rootless: rootless + - criu: criu-dev + go-version: 1.19.x runs-on: ${{ matrix.os }} steps: @@ -84,12 +84,15 @@ jobs: run: | sudo useradd -u2000 -m -d/home/rootless -s/bin/bash rootless # Allow root and rootless itself to execute `ssh rootless@localhost` in tests/rootless.sh - ls -l $GITHUB_WORKSPACE/tests + x="$GITHUB_WORKSPACE/tests/integration"; while [ "$x" != "/" ]; do ls -ld $x; x=`dirname $x`; done ssh-keygen -t ecdsa -N "" -f $HOME/rootless.key sudo mkdir -m 0700 -p /home/rootless/.ssh sudo cp $HOME/rootless.key /home/rootless/.ssh/id_ecdsa sudo cp $HOME/rootless.key.pub /home/rootless/.ssh/authorized_keys sudo chown -R rootless.rootless /home/rootless + set -x + sudo -HE -u rootless PATH="$PATH" -s "cd $GITHUB_WORKSPACE" || true + sudo -HE -u rootless PATH="$PATH" -s "cd $GITHUB_WORKSPACE/tests" || true - name: integration test (fs driver) run: sudo -E PATH="$PATH" script -e -c 'make local${{ matrix.rootless }}integration' diff --git a/Makefile b/Makefile index 870eb7a0015..5099f712c94 100644 --- a/Makefile +++ b/Makefile @@ -58,12 +58,16 @@ endif .DEFAULT: runc runc: + @$(GO) env $(GO_BUILD) -o runc . all: runc recvtty sd-helper seccompagent recvtty sd-helper seccompagent: + @$(GO) version $(GO_BUILD) -o contrib/cmd/$@/$@ ./contrib/cmd/$@ + ldd ./contrib/cmd/$@/$@ + ./contrib/cmd/$@/$@ -version || true static: $(GO_BUILD_STATIC) -o runc .