From 168f0bcd8fd1692d0213b8940d1ade351f4c34f0 Mon Sep 17 00:00:00 2001 From: alon Date: Wed, 25 Oct 2023 15:20:43 +0300 Subject: [PATCH 1/3] add rocky9 --- .github/workflows/common-container.yml | 2 +- .github/workflows/common-flow.yml | 6 ++++-- zip.sh | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/common-container.yml b/.github/workflows/common-container.yml index 8256dcc..73bd827 100644 --- a/.github/workflows/common-container.yml +++ b/.github/workflows/common-container.yml @@ -59,7 +59,7 @@ jobs: # if: ${{ inputs.deploy }} run: ./zip.sh - name: Upload artifact - if: ${{ inputs.deploy }} +# if: ${{ inputs.deploy }} uses: actions/upload-artifact@v3 with: name: RedisStackStub diff --git a/.github/workflows/common-flow.yml b/.github/workflows/common-flow.yml index 663b52d..3dcf5d1 100644 --- a/.github/workflows/common-flow.yml +++ b/.github/workflows/common-flow.yml @@ -46,7 +46,9 @@ jobs: - os: "amazonlinux:2" osnick: "amazonlinux" - os: "rockylinux:8" - osnick: "rockylinux" + osnick: "rockylinux8" + - os: "rockylinux:9" + osnick: "rockylinux9" secrets: inherit uses: ./.github/workflows/common-container.yml with: @@ -65,7 +67,7 @@ jobs: - os: "amazonlinux:2" osnick: "amazonlinux" - os: "rockylinux:8" - osnick: "rockylinux" + osnick: "rockylinux8" secrets: inherit uses: ./.github/workflows/self-hosted-arm.yml with: diff --git a/zip.sh b/zip.sh index f5e52ac..115b11a 100755 --- a/zip.sh +++ b/zip.sh @@ -55,6 +55,7 @@ then ;; esac else + echo ${OS_NICK} declare -A LINUX_OSNICKS=( ["rocky_linux8.8"]="rhel8" ["centos_linux7"]="rhel7" From eec099f6550fa49f2bc943f3f43780c1be935a93 Mon Sep 17 00:00:00 2001 From: alon Date: Wed, 25 Oct 2023 15:26:03 +0300 Subject: [PATCH 2/3] remove curl --- .github/workflows/common-flow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/common-flow.yml b/.github/workflows/common-flow.yml index 3dcf5d1..0b1984b 100644 --- a/.github/workflows/common-flow.yml +++ b/.github/workflows/common-flow.yml @@ -55,7 +55,7 @@ jobs: container: ${{ matrix.os }} os-nickname: ${{ matrix.osnick }} deploy: ${{ inputs.deploy }} - dependencies_command: 'yum install make gcc tar gzip curl python3 python3-devel zip -y' + dependencies_command: 'yum install make gcc tar gzip python3 python3-devel zip -y' yum-flavors-arm: strategy: From 0b686374272085f5e670609b8f001bf298ce9ee5 Mon Sep 17 00:00:00 2001 From: alon Date: Wed, 25 Oct 2023 15:32:34 +0300 Subject: [PATCH 3/3] update zip filename --- zip.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zip.sh b/zip.sh index 115b11a..6defc23 100755 --- a/zip.sh +++ b/zip.sh @@ -55,8 +55,8 @@ then ;; esac else - echo ${OS_NICK} declare -A LINUX_OSNICKS=( + ["rocky_linux9.2"]="rhel9" ["rocky_linux8.8"]="rhel8" ["centos_linux7"]="rhel7" ["ubuntu18.04"]="ubuntu18.04"