This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 12326acdc7dfc49dcc93f96c3d3e503c653cd345
Author: Pasquale Congiusti <pasquale.congiu...@gmail.com>
AuthorDate: Thu Dec 15 13:21:19 2022 +0100
chore(ci): simplify nightly release task
---
.github/actions/release-nightly/action.yml | 9 +++++++++
.github/workflows/automatic-updates.yml | 4 ++--
.github/workflows/release.yml | 31 ++++++++----------------------
3 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/.github/actions/release-nightly/action.yml
b/.github/actions/release-nightly/action.yml
index f8a7e0026..cf78042ef 100644
--- a/.github/actions/release-nightly/action.yml
+++ b/.github/actions/release-nightly/action.yml
@@ -17,6 +17,9 @@ name: release-nightly
description: 'action used to release nightly'
inputs:
+ branch-ref:
+ required: true
+ type: string
goVersion:
required: true
type: string
@@ -39,6 +42,12 @@ runs:
using: "composite"
steps:
+ - name: "Checkout code"
+ uses: actions/checkout@v2
+ with:
+ ref: ${{ inputs.branch-ref }}
+ persist-credentials: false
+ submodules: recursive
- name: Set up JDK ${{ inputs.javaVersion }}
uses: actions/setup-java@v2
with:
diff --git a/.github/workflows/automatic-updates.yml
b/.github/workflows/automatic-updates.yml
index 9b3fe0933..98c331b8e 100644
--- a/.github/workflows/automatic-updates.yml
+++ b/.github/workflows/automatic-updates.yml
@@ -42,11 +42,11 @@ jobs:
with:
branch-ref: "release-1.10.x"
- v1_8_x_lts:
+ v1_8_x:
if: github.repository == 'apache/camel-k'
runs-on: ubuntu-20.04
steps:
- - name: Automatic updates on release-1.18.x
+ - name: Automatic updates on release-1.8.x
uses: ./.github/actions/automatic-updates
with:
branch-ref: "release-1.8.x"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f352bf7bd..477349a3a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,15 +29,10 @@ jobs:
if: github.repository == 'apache/camel-k'
runs-on: ubuntu-20.04
steps:
- - name: Checkout code
- uses: actions/checkout@v2
- with:
- ref: main
- persist-credentials: false
- submodules: recursive
- name: Release main nightly
uses: ./.github/actions/release-nightly
with:
+ branch-ref: "main"
goVersion: "1.17.x"
javaVersion: "11"
secretE2ECluster: ${{ secrets.E2E_CLUSTER_CONFIG }}
@@ -50,41 +45,31 @@ jobs:
if: github.repository == 'apache/camel-k'
runs-on: ubuntu-20.04
steps:
- - name: Checkout code
- uses: actions/checkout@v2
- with:
- ref: release-1.10.x
- persist-credentials: false
- submodules: recursive
- name: Release 1.10 nightly
uses: ./.github/actions/release-nightly
with:
+ branch-ref: "release-1.10.x"
goVersion: "1.17.x"
javaVersion: "11"
secretE2ECluster: ${{ secrets.E2E_CLUSTER_CONFIG }}
secretE2EKube: ${{ secrets.E2E_KUBE_CONFIG }}
secretDockerHubUser: ${{ secrets.TEST_DOCKER_HUB_USERNAME }}
secretDockerHubPassword: ${{ secrets.TEST_DOCKER_HUB_PASSWORD }}
- secretGithubToken: ${{ secrets.GITHUB_TOKEN }}
+ secretGithubToken: ${{ secrets.GITHUB_TOKEN }}
- v1_8_x_lts:
+ v1_8_x:
if: github.repository == 'apache/camel-k'
runs-on: ubuntu-20.04
steps:
- - name: Checkout code
- uses: actions/checkout@v2
- with:
- ref: release-1.8.x
- persist-credentials: false
- submodules: recursive
- - name: Release 1.8 (LTS) nightly
+ - name: Release 1.8 nightly
uses: ./.github/actions/release-nightly
with:
+ branch-ref: "release-1.8.x"
goVersion: "1.16.x"
javaVersion: "11"
secretE2ECluster: ${{ secrets.E2E_CLUSTER_CONFIG }}
secretE2EKube: ${{ secrets.E2E_KUBE_CONFIG }}
secretDockerHubUser: ${{ secrets.TEST_DOCKER_HUB_USERNAME }}
secretDockerHubPassword: ${{ secrets.TEST_DOCKER_HUB_PASSWORD }}
- secretGithubToken: ${{ secrets.GITHUB_TOKEN }}
-
+ secretGithubToken: ${{ secrets.GITHUB_TOKEN }}
+
