diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 33e32d2d48..b88807e07e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,7 +42,7 @@ jobs: steps: # Checkout push-to-registry action GitHub repository - name: Checkout Push to Registry action - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Add yq (for reading recipe.yml) uses: mikefarah/yq@v4.34.2 diff --git a/.github/workflows/publish-iso.yml b/.github/workflows/publish-iso.yml index 3a138055c2..fc82153a35 100644 --- a/.github/workflows/publish-iso.yml +++ b/.github/workflows/publish-iso.yml @@ -12,8 +12,13 @@ jobs: image: fedora:38 options: --privileged steps: +<<<<<<< HEAD:.github/workflows/publish-iso.yml - uses: actions/checkout@v3 - name: Generate ISO +======= + - uses: actions/checkout@v4 + - name: Generate ISO +>>>>>>> cb4160a (build(deps): bump actions/checkout from 3 to 4 (#146)):.github/workflows/release-iso.yml uses: ublue-os/isogenerator@main id: isogenerator with: