mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-08-30 23:37:45 +00:00
release: Remove release type from arch release
Now we don't have minor and major releases and we are now generating a new version in the release workflow, we can tidy up the arch specific releases workflows to remove the extra required inputs Signed-off-by: stevenhorsman <steven@uk.ibm.com>
This commit is contained in:
parent
3cfc1b6ba7
commit
0ab8e61a64
7
.github/workflows/release-amd64.yaml
vendored
7
.github/workflows/release-amd64.yaml
vendored
@ -5,9 +5,6 @@ on:
|
||||
target-arch:
|
||||
required: true
|
||||
type: string
|
||||
release-type:
|
||||
required: true
|
||||
type: string
|
||||
|
||||
jobs:
|
||||
build-kata-static-tarball-amd64:
|
||||
@ -41,11 +38,11 @@ jobs:
|
||||
- name: build-and-push-kata-deploy-ci-amd64
|
||||
id: build-and-push-kata-deploy-ci-amd64
|
||||
run: |
|
||||
# We need to do such trick here as the format of the $GITHUB_REF
|
||||
# We need to do such trick here as the format of the $GITHUB_REF
|
||||
# is "refs/tags/<tag>"
|
||||
tag=$(echo $GITHUB_REF | cut -d/ -f3-)
|
||||
if [ "${tag}" = "main" ]; then
|
||||
tag=$(RELEASE_TYPE=${{ inputs.release-type }} ./tools/packaging/release/release.sh next-release-version)
|
||||
tag=$(./tools/packaging/release/release.sh release-version)
|
||||
tags=(${tag} "latest")
|
||||
else
|
||||
tags=(${tag})
|
||||
|
7
.github/workflows/release-arm64.yaml
vendored
7
.github/workflows/release-arm64.yaml
vendored
@ -5,9 +5,6 @@ on:
|
||||
target-arch:
|
||||
required: true
|
||||
type: string
|
||||
release-type:
|
||||
required: true
|
||||
type: string
|
||||
|
||||
jobs:
|
||||
build-kata-static-tarball-arm64:
|
||||
@ -41,11 +38,11 @@ jobs:
|
||||
- name: build-and-push-kata-deploy-ci-arm64
|
||||
id: build-and-push-kata-deploy-ci-arm64
|
||||
run: |
|
||||
# We need to do such trick here as the format of the $GITHUB_REF
|
||||
# We need to do such trick here as the format of the $GITHUB_REF
|
||||
# is "refs/tags/<tag>"
|
||||
tag=$(echo $GITHUB_REF | cut -d/ -f3-)
|
||||
if [ "${tag}" = "main" ]; then
|
||||
tag=$(RELEASE_TYPE=${{ inputs.release-type }} ./tools/packaging/release/release.sh next-release-version)
|
||||
tag=$(./tools/packaging/release/release.sh release-version)
|
||||
tags=(${tag} "latest")
|
||||
else
|
||||
tags=(${tag})
|
||||
|
7
.github/workflows/release-ppc64le.yaml
vendored
7
.github/workflows/release-ppc64le.yaml
vendored
@ -5,9 +5,6 @@ on:
|
||||
target-arch:
|
||||
required: true
|
||||
type: string
|
||||
release-type:
|
||||
required: true
|
||||
type: string
|
||||
|
||||
jobs:
|
||||
build-kata-static-tarball-ppc64le:
|
||||
@ -46,11 +43,11 @@ jobs:
|
||||
- name: build-and-push-kata-deploy-ci-ppc64le
|
||||
id: build-and-push-kata-deploy-ci-ppc64le
|
||||
run: |
|
||||
# We need to do such trick here as the format of the $GITHUB_REF
|
||||
# We need to do such trick here as the format of the $GITHUB_REF
|
||||
# is "refs/tags/<tag>"
|
||||
tag=$(echo $GITHUB_REF | cut -d/ -f3-)
|
||||
if [ "${tag}" = "main" ]; then
|
||||
tag=$(RELEASE_TYPE=${{ inputs.release-type }} ./tools/packaging/release/release.sh next-release-version)
|
||||
tag=$(./tools/packaging/release/release.sh release-version)
|
||||
tags=(${tag} "latest")
|
||||
else
|
||||
tags=(${tag})
|
||||
|
7
.github/workflows/release-s390x.yaml
vendored
7
.github/workflows/release-s390x.yaml
vendored
@ -5,9 +5,6 @@ on:
|
||||
target-arch:
|
||||
required: true
|
||||
type: string
|
||||
release-type:
|
||||
required: true
|
||||
type: string
|
||||
|
||||
jobs:
|
||||
build-kata-static-tarball-s390x:
|
||||
@ -42,11 +39,11 @@ jobs:
|
||||
- name: build-and-push-kata-deploy-ci-s390x
|
||||
id: build-and-push-kata-deploy-ci-s390x
|
||||
run: |
|
||||
# We need to do such trick here as the format of the $GITHUB_REF
|
||||
# We need to do such trick here as the format of the $GITHUB_REF
|
||||
# is "refs/tags/<tag>"
|
||||
tag=$(echo $GITHUB_REF | cut -d/ -f3-)
|
||||
if [ "${tag}" = "main" ]; then
|
||||
tag=$(RELEASE_TYPE=${{ inputs.release-type }} ./tools/packaging/release/release.sh next-release-version)
|
||||
tag=$(./tools/packaging/release/release.sh release-version)
|
||||
tags=(${tag} "latest")
|
||||
else
|
||||
tags=(${tag})
|
||||
|
16
.github/workflows/release.yaml
vendored
16
.github/workflows/release.yaml
vendored
@ -5,8 +5,6 @@ on:
|
||||
jobs:
|
||||
release:
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
RELEASE_TYPE: ${{ inputs.release-type }}
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
@ -29,7 +27,6 @@ jobs:
|
||||
uses: ./.github/workflows/release-amd64.yaml
|
||||
with:
|
||||
target-arch: amd64
|
||||
release-type: ${{ inputs.release-type }}
|
||||
secrets: inherit
|
||||
|
||||
build-and-push-assets-arm64:
|
||||
@ -37,7 +34,6 @@ jobs:
|
||||
uses: ./.github/workflows/release-arm64.yaml
|
||||
with:
|
||||
target-arch: arm64
|
||||
release-type: ${{ inputs.release-type }}
|
||||
secrets: inherit
|
||||
|
||||
build-and-push-assets-s390x:
|
||||
@ -45,7 +41,6 @@ jobs:
|
||||
uses: ./.github/workflows/release-s390x.yaml
|
||||
with:
|
||||
target-arch: s390x
|
||||
release-type: ${{ inputs.release-type }}
|
||||
secrets: inherit
|
||||
|
||||
build-and-push-assets-ppc64le:
|
||||
@ -53,14 +48,11 @@ jobs:
|
||||
uses: ./.github/workflows/release-ppc64le.yaml
|
||||
with:
|
||||
target-arch: ppc64le
|
||||
release-type: ${{ inputs.release-type }}
|
||||
secrets: inherit
|
||||
|
||||
publish-multi-arch-images:
|
||||
runs-on: ubuntu-latest
|
||||
needs: [build-and-push-assets-amd64, build-and-push-assets-arm64, build-and-push-assets-s390x, build-and-push-assets-ppc64le]
|
||||
env:
|
||||
RELEASE_TYPE: ${{ inputs.release-type }}
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
@ -92,8 +84,6 @@ jobs:
|
||||
upload-multi-arch-static-tarball:
|
||||
needs: [build-and-push-assets-amd64, build-and-push-assets-arm64, build-and-push-assets-s390x, build-and-push-assets-ppc64le]
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
RELEASE_TYPE: ${{ inputs.release-type }}
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
@ -149,8 +139,6 @@ jobs:
|
||||
upload-versions-yaml:
|
||||
needs: release
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
RELEASE_TYPE: ${{ inputs.release-type }}
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: upload versions.yaml
|
||||
@ -162,8 +150,6 @@ jobs:
|
||||
upload-cargo-vendored-tarball:
|
||||
needs: release
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
RELEASE_TYPE: ${{ inputs.release-type }}
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: generate-and-upload-tarball
|
||||
@ -175,8 +161,6 @@ jobs:
|
||||
upload-libseccomp-tarball:
|
||||
needs: release
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
RELEASE_TYPE: ${{ inputs.release-type }}
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: download-and-upload-tarball
|
||||
|
Loading…
Reference in New Issue
Block a user