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 09bf9809ac47df2027a10aa735a916dd6bb4295a Author: Pasquale Congiusti <pasquale.congiu...@gmail.com> AuthorDate: Fri Jul 14 08:33:32 2023 +0200 chore(ci): use a matrix strategy --- .github/workflows/nightly-automatic-updates.yml | 47 +++++---------------- .github/workflows/nightly-native-test.yml | 7 ++-- .github/workflows/nightly-release.yml | 54 ++++--------------------- 3 files changed, 20 insertions(+), 88 deletions(-) diff --git a/.github/workflows/nightly-automatic-updates.yml b/.github/workflows/nightly-automatic-updates.yml index 133c9aa55..3d2839154 100644 --- a/.github/workflows/nightly-automatic-updates.yml +++ b/.github/workflows/nightly-automatic-updates.yml @@ -23,54 +23,25 @@ on: workflow_dispatch: jobs: - main: + auto-updates: + strategy: + fail-fast: false + matrix: + ref-branch: [main, release-1.12.x, release-1.10.x] + if: github.repository == 'apache/camel-k' runs-on: ubuntu-latest - name: Automatic updates on main branch + name: Automatic updates on ${{ matrix.ref-branch }} branch steps: - name: "Checkout code" uses: actions/checkout@v3 with: - ref: main + ref: ${{ matrix.ref-branch }} persist-credentials: false submodules: recursive - name: Automatic updates on main uses: ./.github/actions/automatic-updates with: - branch-ref: "main" - secretGithubToken: ${{ secrets.GITHUB_TOKEN }} - goVersion: "1.18.x" - - v1_12_x: - if: github.repository == 'apache/camel-k' - runs-on: ubuntu-latest - steps: - - name: "Checkout code" - uses: actions/checkout@v2 - with: - ref: release-1.12.x - persist-credentials: false - submodules: recursive - - name: Automatic updates on release-1.12.x branch - uses: ./.github/actions/automatic-updates - with: - branch-ref: "release-1.12.x" + branch-ref: ${{ matrix.ref-branch }} secretGithubToken: ${{ secrets.GITHUB_TOKEN }} goVersion: "1.18.x" - - v1_10_x: - if: github.repository == 'apache/camel-k' - runs-on: ubuntu-latest - steps: - - name: "Checkout code" - uses: actions/checkout@v3 - with: - ref: release-1.10.x - persist-credentials: false - submodules: recursive - - name: Automatic updates on release-1.10.x branch - uses: ./.github/actions/automatic-updates - with: - branch-ref: "release-1.10.x" - secretGithubToken: ${{ secrets.GITHUB_TOKEN }} - goVersion: "1.17.x" diff --git a/.github/workflows/nightly-native-test.yml b/.github/workflows/nightly-native-test.yml index 7e453521c..f38b5b3ac 100644 --- a/.github/workflows/nightly-native-test.yml +++ b/.github/workflows/nightly-native-test.yml @@ -27,14 +27,13 @@ on: jobs: native: - if: github.repository == 'apache/camel-k' - runs-on: macos-12 - strategy: fail-fast: false matrix: - ref-branch: [main, release-1.12.x] + ref-branch: [main, release-1.12.x, release-1.10.x] + if: github.repository == 'apache/camel-k' + runs-on: macos-12 steps: - name: "Checkout code" uses: actions/checkout@v3 diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml index 807a35dc4..9581729af 100644 --- a/.github/workflows/nightly-release.yml +++ b/.github/workflows/nightly-release.yml @@ -31,66 +31,28 @@ on: workflow_dispatch: jobs: - main: - if: github.repository == 'apache/camel-k' - runs-on: ubuntu-latest - steps: - - name: "Checkout code" - uses: actions/checkout@v3 - with: - ref: main - persist-credentials: false - submodules: recursive - - name: Release main nightly - uses: ./.github/actions/release-nightly - with: - goVersion: "1.18.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 }} - - v1_12_x: - if: github.repository == 'apache/camel-k' - runs-on: ubuntu-latest - steps: - - name: "Checkout code" - uses: actions/checkout@v2 - with: - ref: release-1.12.x - persist-credentials: false - submodules: recursive - - name: release-1.12.x nightly - uses: ./.github/actions/release-nightly - with: - goVersion: "1.18.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 }} + release: + strategy: + fail-fast: false + matrix: + ref-branch: [main, release-1.12.x, release-1.10.x] - v1_10_x: if: github.repository == 'apache/camel-k' runs-on: ubuntu-latest steps: - name: "Checkout code" uses: actions/checkout@v3 with: - ref: release-1.10.x + ref: ${{ matrix.ref-branch }} persist-credentials: false submodules: recursive - - name: release-1.10.x nightly + - name: Release nightly ${{ matrix.ref-branch }} branch uses: ./.github/actions/release-nightly with: - goVersion: "1.17.x" + goVersion: "1.18.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 }} -