You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2023/01/31 14:23:45 UTC
[tomee] branch tomee-9.x updated: [TOMEE-4182] GitHub actions: 9.x is not main. keeping only 9.x files
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch tomee-9.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-9.x by this push:
new 8e43fb8a83 [TOMEE-4182] GitHub actions: 9.x is not main. keeping only 9.x files
8e43fb8a83 is described below
commit 8e43fb8a832056b57da4440c26c3ee71a916f618
Author: Swell <57...@users.noreply.github.com>
AuthorDate: Tue Jan 31 15:16:09 2023 +0100
[TOMEE-4182] GitHub actions: 9.x is not main. keeping only 9.x files
---
.github/workflows/tomee-8.x-pull-request-build.yml | 33 -------------
.github/workflows/tomee-8.x-push-build.yml | 55 ----------------------
...-build.yml => tomee-9.x-pull-request-build.yml} | 10 ++--
...ain-push-build.yml => tomee-9.x-push-build.yml} | 16 +++----
4 files changed, 13 insertions(+), 101 deletions(-)
diff --git a/.github/workflows/tomee-8.x-pull-request-build.yml b/.github/workflows/tomee-8.x-pull-request-build.yml
deleted file mode 100644
index 52bb1b23dc..0000000000
--- a/.github/workflows/tomee-8.x-pull-request-build.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: CI Pull Request 8.x
-
-on:
- pull_request:
- branches:
- - tomee-8.x
- workflow_dispatch:
-
-jobs:
- build:
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/checkout@v2
- - name: Set up JDK 1.8
- uses: actions/setup-java@v1
- with:
- java-version: '8'
-
- - name: Cache Maven packages
- uses: actions/cache@v2
- with:
- path: ~/.m2
- key: ${{ runner.os }}-tomee8-pr-m2-${{ hashFiles('**/pom.xml') }}
- restore-keys: ${{ runner.os }}-tomee8-pr-m2
-
- - name: maven-settings-xml-action
- run: echo "<settings xmlns=\"http://maven.apache.org/SETTINGS/1.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd\"> <activeProfiles> <activeProfile>github</activeProfile> </activeProfiles> <profiles> <profile> <id>github</id> <repositories> <repository> <id>central-repo</id> <url>https://repo.maven.apache.org/maven2</url> <releases> <enabled>true</enabled> </relea [...]
-
- - name: Compile with Sanity checks
- run: mvn help:system -U -ntp --batch-mode --show-version --fail-at-end clean install -DfailIfNoTests=false -DskipTests -Pstyle,rat
- env:
- MAVEN_OPTS: -Xmx2048m
\ No newline at end of file
diff --git a/.github/workflows/tomee-8.x-push-build.yml b/.github/workflows/tomee-8.x-push-build.yml
deleted file mode 100644
index 62d8e94cae..0000000000
--- a/.github/workflows/tomee-8.x-push-build.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-name: CI 8.x
-
-on:
- push:
- branches:
- - tomee-8.x
- workflow_dispatch:
-
-jobs:
- build:
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/checkout@v2
- - name: Set up JDK 1.8
- uses: actions/setup-java@v1
- with:
- java-version: '8'
-
- - name: Cache Maven packages
- uses: actions/cache@v2
- with:
- path: ~/.m2
- key: ${{ runner.os }}-tomee8-m2-${{ hashFiles('**/pom.xml') }}
- restore-keys: ${{ runner.os }}-tomee8-m2
-
- - name: maven-settings-xml-action
- run: echo "<settings xmlns=\"http://maven.apache.org/SETTINGS/1.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd\"> <activeProfiles> <activeProfile>github</activeProfile> </activeProfiles> <profiles> <profile> <id>github</id> <repositories> <repository> <id>central-repo</id> <url>https://repo.maven.apache.org/maven2</url> <releases> <enabled>true</enabled> </relea [...]
-
- - name: Compile with Sanity checks
- run: mvn help:system -U -ntp --batch-mode --show-version --fail-at-end clean install -DfailIfNoTests=false -DskipTests -Pstyle,rat
- env:
- MAVEN_OPTS: -Xmx2048m
-
- # We have some LF vs CRLF files from the Tomcat ZIPs, so we need to convert them to avoid diffs in git
- - name: Convert Config Files in BOM Module from CRLF to LF
- run: find ./boms -type f -exec sed -i -e 's/\r$//' {} \;
-
- - name: Create Pull Request after BOM Regeneration
- uses: peter-evans/create-pull-request@v3
- with:
- base: tomee-8.x
- token: ${{ secrets.GITHUB_TOKEN }}
- commit-message: "Minor: Regenerated BOMs for ${{ github.sha }}"
- committer: GitHub <no...@github.com>
- author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
- signoff: true
- branch: tomee-8.x-regenerate_boms_after_dep_upgrade
- delete-branch: true
- title: "Regenerated BOMs after dependency upgrades"
- body: |
- Found some uncommited changes (from BOM regeneration) after running build on TomEE 8.x branch
- labels: |
- dependencies
- assignees: cesarhernandezgt,dblevins,jeanouii,jgallimore,rzo1
\ No newline at end of file
diff --git a/.github/workflows/main-pull-request-build.yml b/.github/workflows/tomee-9.x-pull-request-build.yml
similarity index 88%
rename from .github/workflows/main-pull-request-build.yml
rename to .github/workflows/tomee-9.x-pull-request-build.yml
index f95d26bd97..fd3ecc458a 100644
--- a/.github/workflows/main-pull-request-build.yml
+++ b/.github/workflows/tomee-9.x-pull-request-build.yml
@@ -1,9 +1,9 @@
-name: CI Pull Request Main
+name: CI Pull Request 9.x
on:
pull_request:
branches:
- - main
+ - tomee-9.x
workflow_dispatch:
jobs:
@@ -21,8 +21,8 @@ jobs:
uses: actions/cache@v2
with:
path: ~/.m2
- key: ${{ runner.os }}-main-m2-${{ hashFiles('**/pom.xml') }}
- restore-keys: ${{ runner.os }}-main-m2
+ key: ${{ runner.os }}-tomee9-pr-m2-${{ hashFiles('**/pom.xml') }}
+ restore-keys: ${{ runner.os }}-tomee9-pr-m2
- name: maven-settings-xml-action
run: echo "<settings xmlns=\"http://maven.apache.org/SETTINGS/1.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd\"> <activeProfiles> <activeProfile>github</activeProfile> </activeProfiles> <profiles> <profile> <id>github</id> <repositories> <repository> <id>central-repo</id> <url>https://repo.maven.apache.org/maven2</url> <releases> <enabled>true</enabled> </relea [...]
@@ -30,4 +30,4 @@ jobs:
- name: Compile with Sanity checks
run: mvn help:system -U -ntp --batch-mode --show-version --fail-at-end clean install -DfailIfNoTests=false -DskipTests -Pstyle,rat
env:
- MAVEN_OPTS: -Xmx2048m
\ No newline at end of file
+ MAVEN_OPTS: -Xmx2048m
diff --git a/.github/workflows/main-push-build.yml b/.github/workflows/tomee-9.x-push-build.yml
similarity index 89%
rename from .github/workflows/main-push-build.yml
rename to .github/workflows/tomee-9.x-push-build.yml
index f7db253348..a21fae9c3c 100644
--- a/.github/workflows/main-push-build.yml
+++ b/.github/workflows/tomee-9.x-push-build.yml
@@ -1,9 +1,9 @@
-name: CI Main
+name: CI 9.x
on:
push:
branches:
- - main
+ - tomee-9.x
workflow_dispatch:
jobs:
@@ -21,8 +21,8 @@ jobs:
uses: actions/cache@v2
with:
path: ~/.m2
- key: ${{ runner.os }}-pr-main-m2-${{ hashFiles('**/pom.xml') }}
- restore-keys: ${{ runner.os }}-pr-main-m2
+ key: ${{ runner.os }}-tomee9-m2-${{ hashFiles('**/pom.xml') }}
+ restore-keys: ${{ runner.os }}-tomee9-m2
- name: maven-settings-xml-action
run: echo "<settings xmlns=\"http://maven.apache.org/SETTINGS/1.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd\"> <activeProfiles> <activeProfile>github</activeProfile> </activeProfiles> <profiles> <profile> <id>github</id> <repositories> <repository> <id>central-repo</id> <url>https://repo.maven.apache.org/maven2</url> <releases> <enabled>true</enabled> </relea [...]
@@ -39,17 +39,17 @@ jobs:
- name: Create Pull Request after BOM Regeneration
uses: peter-evans/create-pull-request@v3
with:
- base: main
+ base: tomee-9.x
token: ${{ secrets.GITHUB_TOKEN }}
commit-message: "Minor: Regenerated BOMs for ${{ github.sha }}"
committer: GitHub <no...@github.com>
author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
signoff: true
- branch: regenerate_boms_after_dep_upgrade
+ branch: tomee-9.x-regenerate_boms_after_dep_upgrade
delete-branch: true
title: "Regenerated BOMs after dependency upgrades"
body: |
- Found some uncommited changes (from BOM regeneration) after running build on TomEE main
+ Found some uncommited changes (from BOM regeneration) after running build on TomEE 9.x branch
labels: |
dependencies
- assignees: cesarhernandezgt,dblevins,jeanouii,jgallimore,rzo1
\ No newline at end of file
+ assignees: cesarhernandezgt,dblevins,jeanouii,jgallimore,rzo1