From 30a3a199af3b39e24662bc0321e54450f7fa2c24 Mon Sep 17 00:00:00 2001 From: Ruairidh MacLeod Date: Fri, 3 May 2024 11:51:33 +0100 Subject: [PATCH] remove temporary changes --- .github/workflows/main.yaml | 3 +-- software/FSL/Dockerfile | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index caa3196..a8abd20 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -73,8 +73,7 @@ jobs: name: 'trivy-sbom-report-${{ matrix.package }}' path: 'dependency-results.sbom.json' - name: push image - # if: env.SKIP == '0' && github.ref == 'refs/heads/main' - if: false + if: env.SKIP == '0' && github.ref == 'refs/heads/main' run: | set -euxo pipefail echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin diff --git a/software/FSL/Dockerfile b/software/FSL/Dockerfile index 5fa12d5..f38aaa8 100644 --- a/software/FSL/Dockerfile +++ b/software/FSL/Dockerfile @@ -1,4 +1,3 @@ -# test 3 FROM ubuntu:20.04 ARG FSL_VERSION="6.0.7.9"