This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch sebb-mac-test
in repository https://gitbox.apache.org/repos/asf/commons-crypto.git
commit 1fd5b116b1f8c98e91de74f83bcff4ad8e1fc372
Author: Sebb <s...@apache.org>
AuthorDate: Sun Jun 26 15:06:47 2022 +0100
Temporary branch for testing mac only
---
.github/workflows/codeql-analysis.yml | 81 ----------------------
.github/workflows/coverage.yml | 58 ----------------
.github/workflows/maven.yml | 4 +-
.../java/org/apache/commons/crypto/CryptoTest.java | 4 +-
4 files changed, 4 insertions(+), 143 deletions(-)
diff --git a/.github/workflows/codeql-analysis.yml
b/.github/workflows/codeql-analysis.yml
deleted file mode 100644
index fb95bc3..0000000
--- a/.github/workflows/codeql-analysis.yml
+++ /dev/null
@@ -1,81 +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: "CodeQL"
-
-on:
- # allow direct trigger
- workflow_dispatch:
- push:
- paths-ignore:
- - '**/workflows/*.yml'
- branches: [ master ]
- pull_request:
- paths-ignore:
- - '**/workflows/*.yml'
- # The branches below must be a subset of the branches above
- branches: [ master ]
- schedule:
- - cron: '33 9 * * 4'
-
-jobs:
- analyze:
- name: Analyze
- runs-on: ubuntu-latest
- permissions:
- actions: read
- contents: read
- security-events: write
-
- strategy:
- fail-fast: false
- matrix:
- language: [ 'cpp', 'java' ]
- # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript',
'python', 'ruby' ]
- # Learn more about CodeQL language support at
https://git.io/codeql-language-support
-
- steps:
- - name: Checkout repository
- uses: actions/checkout@v3
-
- # Initializes the CodeQL tools for scanning.
- - name: Initialize CodeQL
- uses: github/codeql-action/init@v2
- with:
- languages: ${{ matrix.language }}
- # If you wish to specify custom queries, you can do so here or in a
config file.
- # By default, queries listed here will override any specified in a
config file.
- # Prefix the list here with "+" to use these queries and those in the
config file.
- # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
- # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
- # If this step fails, then you should remove it and run the build manually
(see below)
-# - name: Autobuild
-# uses: github/codeql-action/autobuild@v1
-
- # âšī¸ Command-line programs to run using the OS shell.
- # đ https://git.io/JvXDl
-
- # âī¸ If the Autobuild fails above, remove it and uncomment the following
three lines
- # and modify them (or add more) to build your code if your project
- # uses a compiled language
-
- - name: Build with Maven
- run: mvn package
-# make bootstrap
-# make release
-
- - name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
deleted file mode 100644
index 6ed53e2..0000000
--- a/.github/workflows/coverage.yml
+++ /dev/null
@@ -1,58 +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:
- # allow direct trigger
- workflow_dispatch:
- push:
- paths-ignore:
- - '**/workflows/*.yml'
- pull_request:
- paths-ignore:
- - '**/workflows/*.yml'
-
-permissions:
- contents: read
-
-jobs:
- build:
-
- runs-on: ubuntu-latest
- strategy:
- matrix:
- java: [ 8 ]
-
- steps:
- - uses: actions/checkout@v3
- - uses: actions/cache@v3.0.4
- with:
- path: ~/.m2/repository
- key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
- restore-keys: |
- ${{ runner.os }}-maven-
- - name: Set up JDK ${{ matrix.java }}
- uses: actions/setup-java@v3
- with:
- distribution: adopt
- java-version: ${{ matrix.java }}
- - name: Build with Maven
- run: mvn -V test jacoco:report --file pom.xml --no-transfer-progress
-
- - name: Upload coverage to Codecov
- uses: codecov/codecov-action@v3
- with:
- files: ./target/site/jacoco/jacoco.xml
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index e70f44f..8526d31 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -32,8 +32,8 @@ jobs:
continue-on-error: ${{ matrix.experimental }}
strategy:
matrix:
- os: [macos-latest, ubuntu-latest, windows-latest]
- java: [ 8, 11, 17 ]
+ os: [macos-latest]
+ java: [ 8 ]
experimental: [false]
# include:
# - java: 18-ea
diff --git a/src/test/java/org/apache/commons/crypto/CryptoTest.java
b/src/test/java/org/apache/commons/crypto/CryptoTest.java
index 8cddcd5..84e9471 100644
--- a/src/test/java/org/apache/commons/crypto/CryptoTest.java
+++ b/src/test/java/org/apache/commons/crypto/CryptoTest.java
@@ -21,7 +21,7 @@ package org.apache.commons.crypto;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.jupiter.api.Disabled;
+// import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
public class CryptoTest {
@@ -49,7 +49,7 @@ public class CryptoTest {
}
@Test
- @Disabled("Mac64 failure with OpenSSL 1.1.1g")
+ // @Disabled("Mac64 failure with OpenSSL 1.1.1g")
public void testMain() throws Throwable {
try {
Crypto.main(new String[0]);
