From 8f6a19f53d1b800cece73f75e10e46b33f64a89f Mon Sep 17 00:00:00 2001 From: cmoulliard Date: Wed, 19 Feb 2025 17:23:22 +0100 Subject: [PATCH 1/9] Created a PR for testing purposes Signed-off-by: cmoulliard --- .github/workflows/podman-v5-ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/podman-v5-ubuntu.yml b/.github/workflows/podman-v5-ubuntu.yml index 7b12b5e..db38d4b 100644 --- a/.github/workflows/podman-v5-ubuntu.yml +++ b/.github/workflows/podman-v5-ubuntu.yml @@ -1,4 +1,4 @@ -name: ubuntu-homebrew-podman +name: ubuntu-homebrew-podman-v5 on: workflow_dispatch: From b3bb627409837124931b6a2ec4b7aee906e7d7d8 Mon Sep 17 00:00:00 2001 From: cmoulliard Date: Wed, 19 Feb 2025 17:34:18 +0100 Subject: [PATCH 2/9] Trigger the workflow on pull_request too Signed-off-by: cmoulliard --- .github/workflows/podman-v5-ubuntu.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/podman-v5-ubuntu.yml b/.github/workflows/podman-v5-ubuntu.yml index db38d4b..2552993 100644 --- a/.github/workflows/podman-v5-ubuntu.yml +++ b/.github/workflows/podman-v5-ubuntu.yml @@ -4,6 +4,7 @@ on: workflow_dispatch: repository_dispatch: types: [e2e-command] + pull_request: push: branches: - main From c6cc0e9151a16756c443022fee0cf475e90b1bcb Mon Sep 17 00:00:00 2001 From: cmoulliard Date: Wed, 19 Feb 2025 17:35:40 +0100 Subject: [PATCH 3/9] Trigger the workflow on pull_request too Signed-off-by: cmoulliard --- .github/workflows/podman-v5-ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/podman-v5-ubuntu.yml b/.github/workflows/podman-v5-ubuntu.yml index 2552993..abdea87 100644 --- a/.github/workflows/podman-v5-ubuntu.yml +++ b/.github/workflows/podman-v5-ubuntu.yml @@ -12,7 +12,7 @@ on: jobs: ci: runs-on: ubuntu-latest - if: ${{ github.event.action == 'e2e-command' }} + if: ${{ github.event.action == 'e2e-command' || github.event.action == 'e2e' }} steps: - name: Checkout repo uses: actions/checkout@v4 From 403b08baebf3803b0b4ddc778cc3aac1377759df Mon Sep 17 00:00:00 2001 From: cmoulliard Date: Wed, 19 Feb 2025 17:41:27 +0100 Subject: [PATCH 4/9] Changing the logic to trigger a flow Signed-off-by: cmoulliard --- .github/workflows/podman-v5-ubuntu.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/podman-v5-ubuntu.yml b/.github/workflows/podman-v5-ubuntu.yml index abdea87..4e89502 100644 --- a/.github/workflows/podman-v5-ubuntu.yml +++ b/.github/workflows/podman-v5-ubuntu.yml @@ -12,7 +12,8 @@ on: jobs: ci: runs-on: ubuntu-latest - if: ${{ github.event.action == 'e2e-command' || github.event.action == 'e2e' }} + #if: ${{ github.event.action == 'e2e-command' || github.event.action == 'e2e' }} + if: github.event.issue.pull_request && contains(github.event.comment.body, '/e2e') steps: - name: Checkout repo uses: actions/checkout@v4 From 4c4a3a3d0b9d7f3455370ccfb706f75be0b5aa85 Mon Sep 17 00:00:00 2001 From: cmoulliard Date: Wed, 19 Feb 2025 17:49:00 +0100 Subject: [PATCH 5/9] Test the job without /e2e Signed-off-by: cmoulliard --- .github/workflows/podman-v5-ubuntu.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/podman-v5-ubuntu.yml b/.github/workflows/podman-v5-ubuntu.yml index 4e89502..d2bd216 100644 --- a/.github/workflows/podman-v5-ubuntu.yml +++ b/.github/workflows/podman-v5-ubuntu.yml @@ -2,8 +2,8 @@ name: ubuntu-homebrew-podman-v5 on: workflow_dispatch: - repository_dispatch: - types: [e2e-command] + #repository_dispatch: + # types: [e2e-command] pull_request: push: branches: @@ -13,7 +13,7 @@ jobs: ci: runs-on: ubuntu-latest #if: ${{ github.event.action == 'e2e-command' || github.event.action == 'e2e' }} - if: github.event.issue.pull_request && contains(github.event.comment.body, '/e2e') + #if: github.event.issue.pull_request && contains(github.event.comment.body, '/e2e') steps: - name: Checkout repo uses: actions/checkout@v4 From 8c2f4a868b26a2715cd82ce1e72fb37857704f03 Mon Sep 17 00:00:00 2001 From: cmoulliard Date: Wed, 19 Feb 2025 17:55:07 +0100 Subject: [PATCH 6/9] Remove non needed code Signed-off-by: cmoulliard --- .github/workflows/podman-v5-ubuntu.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/podman-v5-ubuntu.yml b/.github/workflows/podman-v5-ubuntu.yml index d2bd216..3ff70f2 100644 --- a/.github/workflows/podman-v5-ubuntu.yml +++ b/.github/workflows/podman-v5-ubuntu.yml @@ -31,7 +31,7 @@ jobs: sudo systemctl stop docker brew install podman - brew services start podman + brew services start podman echo "Expose the podman API and podman.socket" podman system service --time=0 & @@ -40,15 +40,12 @@ jobs: echo "Podman rootless: " $(podman info -f json | jq -r .host.security.rootless) echo "Podman sock path: " $(podman info -f json | jq -r .host.remoteSocket.path) - echo "Podman sock path: unix://${XDG_RUNTIME_DIR}/podman/podman.sock" echo "PODMAN_SOCK_PATH=${XDG_RUNTIME_DIR}/podman/podman.sock" >> $GITHUB_ENV - name: Display versions run: | podman -v - crun -v - podman info - name: Run container run: | - podman --log-level debug run -it -p 8888:8888 nginxdemos/nginx-hello:plain-text + podman run -it -p 8888:8888 nginxdemos/nginx-hello:plain-text From 0937ae46df4ee37c4844400e61c018d8f7a21c09 Mon Sep 17 00:00:00 2001 From: cmoulliard Date: Wed, 19 Feb 2025 18:04:07 +0100 Subject: [PATCH 7/9] Review the order of the commands Signed-off-by: cmoulliard --- .github/workflows/podman-v5-ubuntu.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/podman-v5-ubuntu.yml b/.github/workflows/podman-v5-ubuntu.yml index 3ff70f2..dc6d79c 100644 --- a/.github/workflows/podman-v5-ubuntu.yml +++ b/.github/workflows/podman-v5-ubuntu.yml @@ -36,15 +36,16 @@ jobs: echo "Expose the podman API and podman.socket" podman system service --time=0 & + - name: Grab information + run: | + podman -v + echo "Podman version: " $(podman info -f json | jq -r .version.Version) echo "Podman rootless: " $(podman info -f json | jq -r .host.security.rootless) echo "Podman sock path: " $(podman info -f json | jq -r .host.remoteSocket.path) echo "PODMAN_SOCK_PATH=${XDG_RUNTIME_DIR}/podman/podman.sock" >> $GITHUB_ENV - - name: Display versions - run: | - podman -v - name: Run container run: | From b0d41dcc81abb69b392a4f545625ee2e3cbf8410 Mon Sep 17 00:00:00 2001 From: cmoulliard Date: Thu, 20 Feb 2025 08:19:11 +0100 Subject: [PATCH 8/9] Install stable brew Signed-off-by: cmoulliard --- .github/workflows/podman-v5-ubuntu.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/podman-v5-ubuntu.yml b/.github/workflows/podman-v5-ubuntu.yml index dc6d79c..0038e54 100644 --- a/.github/workflows/podman-v5-ubuntu.yml +++ b/.github/workflows/podman-v5-ubuntu.yml @@ -20,6 +20,8 @@ jobs: - name: Set up Homebrew uses: Homebrew/actions/setup-homebrew@master + with: + stable: true - name: Install podman v5 run: | @@ -39,7 +41,7 @@ jobs: - name: Grab information run: | podman -v - + echo "Podman version: " $(podman info -f json | jq -r .version.Version) echo "Podman rootless: " $(podman info -f json | jq -r .host.security.rootless) echo "Podman sock path: " $(podman info -f json | jq -r .host.remoteSocket.path) From e33c3fce88019dbcb561b46e8a2f86e62a833db3 Mon Sep 17 00:00:00 2001 From: cmoulliard Date: Wed, 2 Apr 2025 18:43:25 +0200 Subject: [PATCH 9/9] Update condition Signed-off-by: cmoulliard --- .github/workflows/podman-v5-ubuntu.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/podman-v5-ubuntu.yml b/.github/workflows/podman-v5-ubuntu.yml index 0038e54..6ee3fe8 100644 --- a/.github/workflows/podman-v5-ubuntu.yml +++ b/.github/workflows/podman-v5-ubuntu.yml @@ -2,8 +2,8 @@ name: ubuntu-homebrew-podman-v5 on: workflow_dispatch: - #repository_dispatch: - # types: [e2e-command] + repository_dispatch: + types: [e2e-command] pull_request: push: branches: @@ -12,7 +12,7 @@ on: jobs: ci: runs-on: ubuntu-latest - #if: ${{ github.event.action == 'e2e-command' || github.event.action == 'e2e' }} + if: ${{ github.event.action == 'e2e-command' || github.event.action == 'e2e' }} #if: github.event.issue.pull_request && contains(github.event.comment.body, '/e2e') steps: - name: Checkout repo