From 4ebb0cea0d663b15b8ee10270d7252e108434bf4 Mon Sep 17 00:00:00 2001 From: Simon Baerlocher Date: Thu, 25 Jan 2024 22:19:42 +0100 Subject: [PATCH] build --- .github/workflows/publish.yml | 14 +++++++------- .github/workflows/test.yml | 9 +++++---- tox.ini | 24 ------------------------ 3 files changed, 12 insertions(+), 35 deletions(-) delete mode 100644 tox.ini diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3c6a587..1365e3c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,9 +10,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@master + - uses: actions/checkout@v4 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v5 with: python-version: "3.9" @@ -26,16 +26,16 @@ jobs: env: DOCKER_BUILDKIT: 1 run: | - tox -e docker -- --tag=ghcr.io/arillso/kubernetes:latest --tag=arillso/kubernetes:latest + ansible-builder build -v3 --tag=ghcr.io/arillso/kubernetes:${{ github.sha }} --tag=arillso/kubernetes:${{ github.sha }} --container-runtime=docker - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: sbaerlocher password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to GitHub Container Registry - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} @@ -43,5 +43,5 @@ jobs: - name: Push run: | - docker push ghcr.io/arillso/kubernetes:${{ github.sha }} - docker push arillso/kubernetes:${{ github.sha }} + docker push ghcr.io/arillso/kubernetes:latest + docker push arillso/kubernetes:latest diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 181741c..fc83c06 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,13 +1,14 @@ name: Testing Container on: [push] + jobs: testing: runs-on: ubuntu-latest steps: - - uses: actions/checkout@master + - uses: actions/checkout@v4 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v5 with: python-version: "3.9" @@ -23,13 +24,13 @@ jobs: ansible-builder build -v3 --tag=ghcr.io/arillso/kubernetes:${{ github.sha }} --tag=arillso/kubernetes:${{ github.sha }} --container-runtime=docker - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: sbaerlocher password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to GitHub Container Registry - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} diff --git a/tox.ini b/tox.ini deleted file mode 100644 index e7cc4ee..0000000 --- a/tox.ini +++ /dev/null @@ -1,24 +0,0 @@ -[tox] -minversion = 1.6 -skipsdist = True - -[testenv] -basepython = python3 - -[testenv:podman] -passenv = HOME -allowlist_externals = - /bin/bash - podman - ansible-builder -commands = - ansible-builder build -v3 -t quay.io/ansible/awx-ee {posargs} - -[testenv:docker] -passenv = HOME,DOCKER_BUILDKIT -allowlist_externals = - /bin/bash - docker - ansible-builder -commands = - ansible-builder build -v3 -t quay.io/ansible/awx-ee {posargs} --container-runtime=docker --verbosity 2