From c47bf4833aef41e6ac3e8c831c1cfa8afc091592 Mon Sep 17 00:00:00 2001 From: Itxaka Date: Mon, 21 Aug 2023 11:09:46 +0200 Subject: [PATCH] Try to fix tests due to upx (#343) Signed-off-by: Itxaka --- .github/workflows/pr.yml | 6 +++--- .github/workflows/push.yml | 6 +++--- .github/workflows/release.yml | 6 +++--- Dockerfile | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 08820dec..3702f308 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -19,7 +19,7 @@ jobs: uses: docker-practice/actions-setup-docker@0.0.1 - name: Install deps run: | - sudo apt-get install -y upx && sudo -E env "PATH=$PATH" make deps + sudo apt-get update && sudo apt-get install -y upx && sudo -E env "PATH=$PATH" make deps sudo curl -fSL "https://github.com/genuinetools/img/releases/download/v0.5.11/img-linux-amd64" -o "/usr/bin/img" sudo chmod a+x "/usr/bin/img" - name: Tests with Img backend @@ -42,7 +42,7 @@ jobs: uses: docker-practice/actions-setup-docker@0.0.1 - name: Install deps run: | - sudo apt-get install -y upx && sudo -E env "PATH=$PATH" make deps + sudo apt-get update && sudo apt-get install -y upx && sudo -E env "PATH=$PATH" make deps - name: Tests run: sudo -E env "PATH=$PATH" make test-integration tests-unit: @@ -62,7 +62,7 @@ jobs: uses: docker-practice/actions-setup-docker@0.0.1 - name: Install deps run: | - sudo apt-get install -y upx && sudo -E env "PATH=$PATH" make deps + sudo apt-get update && sudo apt-get install -y upx && sudo -E env "PATH=$PATH" make deps sudo curl -fSL "https://github.com/genuinetools/img/releases/download/v0.5.11/img-linux-amd64" -o "/usr/bin/img" sudo chmod a+x "/usr/bin/img" sudo make build diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index f9e76d06..18453414 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -18,7 +18,7 @@ jobs: run: echo ${{ secrets.DOCKER_TESTING_PASSWORD }} | sudo -E docker login -u ${{ secrets.DOCKER_TESTING_USERNAME }} --password-stdin quay.io - name: Install deps run: | - sudo apt-get install -y upx && sudo -E env "PATH=$PATH" make deps + sudo apt-get update && sudo apt-get install -y upx && sudo -E env "PATH=$PATH" make deps sudo curl -fSL "https://github.com/genuinetools/img/releases/download/v0.5.11/img-linux-amd64" -o "/usr/bin/img" sudo chmod a+x "/usr/bin/img" - name: Login to quay with img @@ -42,7 +42,7 @@ jobs: run: echo ${{ secrets.DOCKER_TESTING_PASSWORD }} | sudo -E docker login -u ${{ secrets.DOCKER_TESTING_USERNAME }} --password-stdin quay.io - name: Install deps run: | - sudo apt-get install -y upx && sudo -E env "PATH=$PATH" make deps + sudo apt-get update && sudo apt-get install -y upx && sudo -E env "PATH=$PATH" make deps - name: Tests run: | sudo -E \ @@ -66,7 +66,7 @@ jobs: run: echo ${{ secrets.DOCKER_TESTING_PASSWORD }} | sudo -E docker login -u ${{ secrets.DOCKER_TESTING_USERNAME }} --password-stdin quay.io - name: Install deps run: | - sudo apt-get install -y upx && sudo -E env "PATH=$PATH" make deps + sudo apt-get update && sudo apt-get install -y upx && sudo -E env "PATH=$PATH" make deps sudo curl -fSL "https://github.com/genuinetools/img/releases/download/v0.5.11/img-linux-amd64" -o "/usr/bin/img" sudo chmod a+x "/usr/bin/img" sudo make build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 59e805e2..4ea168c0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,7 +23,7 @@ jobs: run: echo ${{ secrets.DOCKER_TESTING_PASSWORD }} | sudo -E docker login -u ${{ secrets.DOCKER_TESTING_USERNAME }} --password-stdin quay.io - name: Install deps run: | - sudo apt-get install -y upx && sudo -E env "PATH=$PATH" make deps + sudo apt-get update && sudo apt-get install -y upx && sudo -E env "PATH=$PATH" make deps sudo curl -fSL "https://github.com/genuinetools/img/releases/download/v0.5.11/img-linux-amd64" -o "/usr/bin/img" sudo chmod a+x "/usr/bin/img" - name: Login to quay with img @@ -49,7 +49,7 @@ jobs: run: echo ${{ secrets.DOCKER_TESTING_PASSWORD }} | sudo -E docker login -u ${{ secrets.DOCKER_TESTING_USERNAME }} --password-stdin quay.io - name: Install deps run: | - sudo apt-get install -y upx && sudo -E env "PATH=$PATH" make deps + sudo apt-get update && sudo apt-get install -y upx && sudo -E env "PATH=$PATH" make deps - name: Tests run: | sudo -E \ @@ -75,7 +75,7 @@ jobs: run: echo ${{ secrets.DOCKER_TESTING_PASSWORD }} | sudo -E docker login -u ${{ secrets.DOCKER_TESTING_USERNAME }} --password-stdin quay.io - name: Install deps run: | - sudo apt-get install -y upx && sudo -E env "PATH=$PATH" make deps + sudo apt-get update && sudo apt-get install -y upx && sudo -E env "PATH=$PATH" make deps sudo curl -fSL "https://github.com/genuinetools/img/releases/download/v0.5.11/img-linux-amd64" -o "/usr/bin/img" sudo chmod a+x "/usr/bin/img" sudo make build diff --git a/Dockerfile b/Dockerfile index ca0a8da7..d529d305 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang as builder +FROM golang:bullseye as builder RUN apt-get update && apt-get install -y upx ADD . /luet RUN cd /luet && make build