diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 92441d6..c45ddc6 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -26,7 +26,7 @@ jobs: run: echo "VERSION=$(cat VERSION)" >> $GITHUB_OUTPUT build: needs: [set_version] - uses: gardenlinux/gardenlinux/.github/workflows/build.yml@bced61a3657ac2335f3baf1cae37e0f859313ee1 + uses: gardenlinux/gardenlinux/.github/workflows/build.yml@b49b2dc9853b2a91a509c6ad947bc538797a4068 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 2ec0b06..0ec2454 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@bced61a3657ac2335f3baf1cae37e0f859313ee1 + uses: gardenlinux/gardenlinux/.github/workflows/build.yml@b49b2dc9853b2a91a509c6ad947bc538797a4068 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@bced61a3657ac2335f3baf1cae37e0f859313ee1 + # uses: gardenlinux/gardenlinux/.github/workflows/upload_oci.yml@b49b2dc9853b2a91a509c6ad947bc538797a4068 uses: ./.github/workflows/upload_oci.yml with: version: ${{ needs.build.outputs.version }} diff --git a/.github/workflows/upload_oci.yml b/.github/workflows/upload_oci.yml index 155693e..725d777 100644 --- a/.github/workflows/upload_oci.yml +++ b/.github/workflows/upload_oci.yml @@ -8,7 +8,7 @@ on: jobs: generate_matrix_publish: name: Generate flavors matrix to publish - uses: gardenlinux/gardenlinux/.github/workflows/build_flavors_matrix.yml@bced61a3657ac2335f3baf1cae37e0f859313ee1 + uses: gardenlinux/gardenlinux/.github/workflows/build_flavors_matrix.yml@b49b2dc9853b2a91a509c6ad947bc538797a4068 with: flags: '--exclude "bare-*" --no-arch --json-by-arch --build --test' upload_gl_artifacts: diff --git a/Makefile b/Makefile index 12039a6..cc65175 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ prepare: git submodule update --init --recursive update: - # update gardenlinux submodule to specified or latest commit + # update gardenlinux submodule to specified or latest commit cd $(ROOT_DIR)/gardenlinux && git fetch && git checkout $(COMMIT) && cd .. git add gardenlinux diff --git a/features/_fwcfg b/features/_fwcfg new file mode 120000 index 0000000..568d6d4 --- /dev/null +++ b/features/_fwcfg @@ -0,0 +1 @@ +../gardenlinux/features/_fwcfg \ No newline at end of file diff --git a/features/_kdump b/features/_kdump new file mode 120000 index 0000000..a96ce3a --- /dev/null +++ b/features/_kdump @@ -0,0 +1 @@ +../gardenlinux/features/_kdump \ No newline at end of file diff --git a/gardenlinux b/gardenlinux index bced61a..b49b2dc 160000 --- a/gardenlinux +++ b/gardenlinux @@ -1 +1 @@ -Subproject commit bced61a3657ac2335f3baf1cae37e0f859313ee1 +Subproject commit b49b2dc9853b2a91a509c6ad947bc538797a4068 diff --git a/test-ng b/test-ng new file mode 120000 index 0000000..a277911 --- /dev/null +++ b/test-ng @@ -0,0 +1 @@ +gardenlinux/test-ng \ No newline at end of file