diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 76be3fa6..08e38cd9 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -27,16 +27,12 @@ jobs: - name: use VERSION file to support dev build on rel-branch id: version run: | - if [ "${{ github.event_name }}" = "pull_request" ]; then - echo "VERSION=today" >> $GITHUB_OUTPUT - else - echo "VERSION=$(cat VERSION)" >> $GITHUB_OUTPUT - fi + echo "VERSION=$(cat VERSION)" >> $GITHUB_OUTPUT build: needs: [set_version] if: ${{ github.event_name != 'pull_request' || github.event.action != 'closed' }} - uses: gardenlinux/gardenlinux/.github/workflows/build.yml@5282bd31155e6ce2dc6c1b62b72caf662e198f74 + uses: gardenlinux/gardenlinux/.github/workflows/build.yml@3d56ba627f7f471e64f36608ffbc84a441d309d9 with: version: ${{ needs.set_version.outputs.VERSION }} # to set target to "release" or "nightly" we need proper KMS secrets diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index e1e477cc..781fd9bb 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -19,7 +19,7 @@ jobs: submodules: recursive build: needs: [checkout] - uses: gardenlinux/gardenlinux/.github/workflows/build.yml@5282bd31155e6ce2dc6c1b62b72caf662e198f74 + uses: gardenlinux/gardenlinux/.github/workflows/build.yml@3d56ba627f7f471e64f36608ffbc84a441d309d9 with: version: ${{ inputs.version || 'now' }} # to set target to "release" or "nightly" we need proper KMS secrets @@ -36,7 +36,7 @@ jobs: name: Run glcli to publish to OCI needs: [build] # use custom upload_oci.yml as we do not sign the images - # uses: gardenlinux/gardenlinux/.github/workflows/upload_oci.yml@5282bd31155e6ce2dc6c1b62b72caf662e198f74 + # uses: gardenlinux/gardenlinux/.github/workflows/upload_oci.yml@3d56ba627f7f471e64f36608ffbc84a441d309d9 uses: ./.github/workflows/upload_oci.yml with: version: ${{ needs.build.outputs.version }} diff --git a/VERSION b/VERSION index 96761cc5..089ca983 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1877.9.6 +1877.10.1 diff --git a/gardenlinux b/gardenlinux index 171a5397..3d56ba62 160000 --- a/gardenlinux +++ b/gardenlinux @@ -1 +1 @@ -Subproject commit 171a5397058b93b419f5127d6247b0bdb7b1844d +Subproject commit 3d56ba627f7f471e64f36608ffbc84a441d309d9