You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2022/06/12 23:36:02 UTC
[commons-crypto] branch master updated: Restore main build; hive off Windows
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-crypto.git
The following commit(s) were added to refs/heads/master by this push:
new 6143084 Restore main build; hive off Windows
6143084 is described below
commit 6143084bff8e0353aa68f873c3022af8645c9036
Author: Sebb <se...@apache.org>
AuthorDate: Mon Jun 13 00:35:56 2022 +0100
Restore main build; hive off Windows
---
.github/workflows/codeql-analysis.yml | 6 ++++--
.github/workflows/coverage.yml | 6 ++++--
.github/workflows/maven.yml | 27 +++++++++++++-------------
.github/workflows/{maven.yml => maven_win.yml} | 7 +++----
4 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index c1ea60e..fb95bc3 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -16,13 +16,15 @@
name: "CodeQL"
on:
+ # allow direct trigger
+ workflow_dispatch:
push:
paths-ignore:
- - '**/workflows/maven.yml'
+ - '**/workflows/*.yml'
branches: [ master ]
pull_request:
paths-ignore:
- - '**/workflows/maven.yml'
+ - '**/workflows/*.yml'
# The branches below must be a subset of the branches above
branches: [ master ]
schedule:
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 115745b..6ed53e2 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -16,12 +16,14 @@
name: Coverage
on:
+ # allow direct trigger
+ workflow_dispatch:
push:
paths-ignore:
- - '**/workflows/maven.yml'
+ - '**/workflows/*.yml'
pull_request:
paths-ignore:
- - '**/workflows/maven.yml'
+ - '**/workflows/*.yml'
permissions:
contents: read
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 07fc6dd..f8666d9 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -15,7 +15,15 @@
name: Java CI
-on: [push, pull_request]
+on:
+ # allow direct trigger
+ workflow_dispatch:
+ push:
+ paths-ignore:
+ - '**/workflows/*.yml'
+ pull_request:
+ paths-ignore:
+ - '**/workflows/*.yml'
jobs:
build:
@@ -24,11 +32,8 @@ jobs:
continue-on-error: ${{ matrix.experimental }}
strategy:
matrix:
- # os: [macos-latest, ubuntu-latest, windows-latest]
- # java: [ 8, 11, 17 ]
- # Trying to fix Windows build
- os: [windows-latest]
- java: [ 8 ]
+ os: [macos-latest, ubuntu-latest]
+ java: [ 8, 11, 17 ]
experimental: [false]
# include:
# - java: 18-ea
@@ -57,11 +62,5 @@ jobs:
java-version: ${{ matrix.java }}
- name: OpenSSL version
run: openssl version
- - name: Find missing file
- run: |
- cd \
- ruby -rfind -e "Find.find('.').each{|x| puts x if x.end_with? 'openssl'}"
- d:
- ruby -rfind -e "Find.find('.').each{|x| puts x if x.end_with? 'openssl'}"
- # - name: Build with Maven
- # run: mvn -V --file pom.xml --no-transfer-progress -DtrimStackTrace=false
+ - name: Build with Maven
+ run: mvn -V --file pom.xml --no-transfer-progress -DtrimStackTrace=false
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven_win.yml
similarity index 94%
copy from .github/workflows/maven.yml
copy to .github/workflows/maven_win.yml
index 07fc6dd..e757834 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven_win.yml
@@ -13,9 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-name: Java CI
+name: Java CI Win
-on: [push, pull_request]
+on:
+ workflow_dispatch:
jobs:
build:
@@ -24,8 +25,6 @@ jobs:
continue-on-error: ${{ matrix.experimental }}
strategy:
matrix:
- # os: [macos-latest, ubuntu-latest, windows-latest]
- # java: [ 8, 11, 17 ]
# Trying to fix Windows build
os: [windows-latest]
java: [ 8 ]