You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2023/07/14 06:37:32 UTC
[camel-k] branch main updated (3a8727cbf -> d3e79ccc1)
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
from 3a8727cbf chore(deps): bump github.com/container-tools/spectrum
new 7908e70c1 chore(ci): remove backport action
new 888d6c43f chore(ci): move badge wf into automatic updates
new 09bf9809a chore(ci): use a matrix strategy
new b40ff0f4c chore(ci): coverage rename
new d3e79ccc1 chore(ci): bump java version
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/actions/automatic-updates/action.yml | 37 ++++++++-
.github/actions/backport | 1 -
.github/workflows/backport.yml | 38 ----------
.../{coverage-report.yml => coverage.yml} | 0
.github/workflows/nightly-automatic-updates.yml | 47 +++---------
.github/workflows/nightly-coverage.yml | 87 ----------------------
.github/workflows/nightly-native-test.yml | 7 +-
.github/workflows/nightly-release.yml | 56 +++-----------
.gitmodules | 3 -
9 files changed, 54 insertions(+), 222 deletions(-)
delete mode 160000 .github/actions/backport
delete mode 100644 .github/workflows/backport.yml
rename .github/workflows/{coverage-report.yml => coverage.yml} (100%)
delete mode 100644 .github/workflows/nightly-coverage.yml
[camel-k] 03/05: chore(ci): use a matrix strategy
Posted by pc...@apache.org.
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 <pa...@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 }}
-
[camel-k] 05/05: chore(ci): bump java version
Posted by pc...@apache.org.
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 d3e79ccc1ec202ab39fee50d6d332e85b81e3d9f
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Fri Jul 14 08:35:22 2023 +0200
chore(ci): bump java version
---
.github/workflows/nightly-release.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml
index 9581729af..cb904edca 100644
--- a/.github/workflows/nightly-release.yml
+++ b/.github/workflows/nightly-release.yml
@@ -50,7 +50,7 @@ jobs:
uses: ./.github/actions/release-nightly
with:
goVersion: "1.18.x"
- javaVersion: "11"
+ javaVersion: "17"
secretE2ECluster: ${{ secrets.E2E_CLUSTER_CONFIG }}
secretE2EKube: ${{ secrets.E2E_KUBE_CONFIG }}
secretDockerHubUser: ${{ secrets.TEST_DOCKER_HUB_USERNAME }}
[camel-k] 01/05: chore(ci): remove backport action
Posted by pc...@apache.org.
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 7908e70c1ef604f6729f27f3bf34bcb7ee5ca0f9
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Fri Jul 14 07:59:33 2023 +0200
chore(ci): remove backport action
We're not really using as it does not work in forks
---
.github/actions/backport | 1 -
.github/workflows/backport.yml | 38 --------------------------------------
.gitmodules | 3 ---
3 files changed, 42 deletions(-)
diff --git a/.github/actions/backport b/.github/actions/backport
deleted file mode 160000
index 2d7713b17..000000000
--- a/.github/actions/backport
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2d7713b178ee4f86d505da2f829301b912c0a4ca
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
deleted file mode 100644
index d126c1f47..000000000
--- a/.github/workflows/backport.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-
-name: Backport
-on:
- pull_request:
- types:
- - closed
- - labeled
-
-jobs:
- backport:
- runs-on: ubuntu-latest
- name: Backport
- steps:
- - name: "Checkout camel-k"
- uses: actions/checkout@v3
- with:
- persist-credentials: false
- submodules: recursive
- - name: Backport
- uses: ./.github/actions/backport
- with:
- github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitmodules b/.gitmodules
index c66b40d2d..e9ac64d51 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule ".github/actions/backport"]
- path = .github/actions/backport
- url = https://github.com/tibdex/backport
[submodule ".github/actions/changelog"]
path = .github/actions/changelog
url = https://github.com/CharMixer/auto-changelog-action
[camel-k] 02/05: chore(ci): move badge wf into automatic updates
Posted by pc...@apache.org.
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 888d6c43fdbbb74235f9a555e83597f032bc6a0d
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Fri Jul 14 08:10:48 2023 +0200
chore(ci): move badge wf into automatic updates
---
.github/actions/automatic-updates/action.yml | 37 ++++++++++--
.github/workflows/nightly-coverage.yml | 87 ----------------------------
2 files changed, 33 insertions(+), 91 deletions(-)
diff --git a/.github/actions/automatic-updates/action.yml b/.github/actions/automatic-updates/action.yml
index 43df1ec44..60bcc3a73 100644
--- a/.github/actions/automatic-updates/action.yml
+++ b/.github/actions/automatic-updates/action.yml
@@ -40,6 +40,8 @@ runs:
with:
token: ${{ inputs.secretGithubToken }}
release_branch: ${{ inputs.branch-ref }}
+
+ # Changelog
- name: Commit changelog
shell: bash
env:
@@ -48,7 +50,9 @@ runs:
run: |
git config --local user.email "$CI_EMAIL"
git config --local user.name "$CI_USER"
- git add CHANGELOG.md && git commit -m 'chore: changelog automatic update' && echo "changelog=1" >> $GITHUB_ENV || echo "No changes to CHANGELOG"
+ git add CHANGELOG.md && git commit -m 'chore: changelog automatic update' && echo "changelog=1" >> $GITHUB_ENV || echo "No changes to changelog"
+
+ # Autogenerated
- name: Run refresh actions and commit
shell: bash
env:
@@ -56,7 +60,9 @@ runs:
CI_EMAIL: "41898282+github-actions[bot]@users.noreply.github.com"
run: |
make update-default-camel generate codegen update-docs
- git add -A && git commit -m 'chore: nightly resource refresh' && echo "refresh=1" >> $GITHUB_ENV || echo "No changes to make update-docs"
+ git add -A && git commit -m 'chore: autogenerated project resource update' && echo "autogenerated=1" >> $GITHUB_ENV || echo "No changes to autogenerated project resources"
+
+ # SBOM
- name: Generate SBOM
uses: ./.github/actions/gh-go-mod-generate-sbom
with:
@@ -68,10 +74,33 @@ runs:
CI_USER: "github-actions[bot]"
CI_EMAIL: "41898282+github-actions[bot]@users.noreply.github.com"
run: |
- git add camel-k-sbom/camel-k-sbom.json && git commit -m 'chore: nightly SBOM refresh' && echo "sbom=1" >> $GITHUB_ENV || echo "No changes to SBOM"
+ git add camel-k-sbom/camel-k-sbom.json && git commit -m 'chore: nightly SBOM update' && echo "sbom=1" >> $GITHUB_ENV || echo "No changes to SBOM"
+
+ # Coverage badge
+ - name: Go Coverage Badge
+ uses: ./.github/actions/coverage-badge
+ with:
+ filename: coverage.out
+ target: badge.out
+ - name: Convert Badge to adoc
+ run: |
+ replacement=$(grep -o 'https://[^)]*' badge.out)
+ target="(?:https:\/\/img\.shields\.io\/badge\/Coverage).*?(?=\.svg)"
+ perl -i -pe "s|${target}|${replacement}|g" README.adoc
+ - name: Commit changes
+ shell: bash
+ env:
+ CI_USER: "github-actions[bot]"
+ CI_EMAIL: "41898282+github-actions[bot]@users.noreply.github.com"
+ run: |
+ git config --local user.email "$CI_EMAIL"
+ git config --local user.name "$CI_USER"
+ git add -A && git commit -m 'chore: nightly coverage badge update' && echo "badge=1" >> $GITHUB_ENV || echo "No changes to coverage badge"
+
+ # Git push
- name: Push changes
shell: bash
- if: env.changelog == 1 || env.refresh == 1 || env.sbom == 1
+ if: env.changelog == 1 || env.autogenerated == 1 || env.sbom == 1 || env.badge == 1
env:
CI_USER: "github-actions[bot]"
CI_EMAIL: "41898282+github-actions[bot]@users.noreply.github.com"
diff --git a/.github/workflows/nightly-coverage.yml b/.github/workflows/nightly-coverage.yml
deleted file mode 100644
index 261e3de0e..000000000
--- a/.github/workflows/nightly-coverage.yml
+++ /dev/null
@@ -1,87 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-
-name: coverage
-
-on:
- schedule:
- - cron: '45 1 * * *'
- workflow_dispatch:
-
-jobs:
- test:
- if: github.repository == 'apache/camel-k'
- runs-on: ubuntu-latest
- name: Update Coverage Badge
- steps:
- - name: Checkout
- uses: actions/checkout@v3
- with:
- persist-credentials: false
- fetch-depth: 0
-
- - name: Setup go
- uses: actions/setup-go@v3
- with:
- go-version: '1.18'
- check-latest: true
-
- - uses: actions/cache@v3
- with:
- path: ~/go/pkg/mod
- key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
- restore-keys: |
- ${{ runner.os }}-go-
-
- - name: Run Test
- run: |
- go test -v ./... -covermode=count -coverprofile=coverage.out
- go tool cover -func=coverage.out -o=coverage.out
- touch badge.out
-
- - name: Go Coverage Badge
-
- uses: ./.github/actions/coverage-badge
- with:
- filename: coverage.out
- target: badge.out
-
- - name: Convert Badge to adoc
- run: |
- replacement=$(grep -o 'https://[^)]*' badge.out)
- target="(?:https:\/\/img\.shields\.io\/badge\/Coverage).*?(?=\.svg)"
- perl -i -pe "s|${target}|${replacement}|g" README.adoc
-
- - name: Commit changes
- shell: bash
- env:
- CI_USER: "github-actions[bot]"
- CI_EMAIL: "41898282+github-actions[bot]@users.noreply.github.com"
- run: |
- git config --local user.email "$CI_EMAIL"
- git config --local user.name "$CI_USER"
- git add -A && git commit -m 'chore: nightly coverage badge' && echo "refresh=1" >> $GITHUB_ENV || echo "No changes to make update-docs"
-
- - name: Push changes
- shell: bash
- if: env.changelog == 1 || env.refresh == 1
- env:
- CI_USER: "github-actions[bot]"
- CI_EMAIL: "41898282+github-actions[bot]@users.noreply.github.com"
- CI_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- run: |
- git push "https://$CI_USER:$CI_TOKEN@github.com/$GITHUB_REPOSITORY.git" '${{ github.ref_name }}'
[camel-k] 04/05: chore(ci): coverage rename
Posted by pc...@apache.org.
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 b40ff0f4c9aeedeaf34427de3ec91e7892db7ac3
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Fri Jul 14 08:33:47 2023 +0200
chore(ci): coverage rename
---
.github/workflows/{coverage-report.yml => coverage.yml} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/.github/workflows/coverage-report.yml b/.github/workflows/coverage.yml
similarity index 100%
rename from .github/workflows/coverage-report.yml
rename to .github/workflows/coverage.yml