From e619294b1ba80cdf84998260c083ec401d261e19 Mon Sep 17 00:00:00 2001 From: Paul Hebble Date: Tue, 21 May 2024 18:29:04 -0500 Subject: [PATCH 1/2] Trivial workflow edits to test KSP-CKAN/CKAN#4094 --- .github/workflows/build.yml | 5 ++++- .github/workflows/deploy.yml | 7 ++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2127eff..de7f9e1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,10 @@ name: Build NetKAN-Infra on: pull_request: - types: [opened, synchronize, reopened] + types: + - opened + - synchronize + - reopened jobs: main: diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ce3ea24..3b11022 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -59,7 +59,9 @@ jobs: deploy: if: ${{ github.repository == 'KSP-CKAN/NetKAN-Infra' }} runs-on: ubuntu-latest - needs: [ 'build', 'webhooks' ] + needs: + - build + - webhooks steps: - uses: actions/checkout@v4 - name: Set up Python @@ -69,8 +71,7 @@ jobs: cache: pip cache-dependency-path: netkan/setup.py - name: Install Dependencies - run: | - pip install netkan/. + run: pip install netkan/. - name: Re-deploy Containers env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} From 9ac12c90a17264359d5b21e3d98ac8364246d193 Mon Sep 17 00:00:00 2001 From: Paul Hebble Date: Tue, 21 May 2024 18:44:48 -0500 Subject: [PATCH 2/2] Pin pre-venv Ubuntu version --- netkan/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netkan/Dockerfile b/netkan/Dockerfile index b2237ce..fc7a387 100644 --- a/netkan/Dockerfile +++ b/netkan/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:latest as ubuntu_with_python +FROM ubuntu:22.04 as ubuntu_with_python # Don't prompt for time zone ENV DEBIAN_FRONTEND=noninteractive