Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set MacOS Runner to 11 and Fix Unknown Method Error #242

Merged
merged 4 commits into from
Sep 9, 2023
Merged

Set MacOS Runner to 11 and Fix Unknown Method Error #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01a01d9
Fix unknown method error.
Aug 27, 2023
532d2f6
Set MacOS runner version to 11.
Aug 27, 2023
dcaf7fb
Update comment.
Aug 27, 2023
f700eed
Merge branch 'apache:master' into master
aremily Sep 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ jobs:
continue-on-error: ${{ matrix.experimental }}
strategy:
matrix:
# ubuntu-latest uses OpenSSL 3 which breaks tests
os: [macos-latest, ubuntu-20.04, windows-latest]
# macos-latest and ubuntu-latest uses OpenSSL 3 which breaks tests
os: [macos-11, ubuntu-20.04, windows-latest]
java: [ 8, 11, 17 ]
experimental: [false]
# include:
Expand Down
3 changes: 1 addition & 2 deletions src/test/java/org/apache/commons/crypto/AbstractBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import org.apache.commons.crypto.random.CryptoRandom;
import org.apache.commons.crypto.random.CryptoRandomFactory;
import org.apache.commons.crypto.utils.AES;
import org.apache.commons.crypto.utils.Utils;

import static org.junit.jupiter.api.Assertions.assertEquals;

Expand All @@ -39,7 +38,7 @@ public abstract class AbstractBenchmark {
0x09, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16 };
private static final byte[] IV = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 };
private static final SecretKeySpec keySpec = Utils.newSecretKeySpec(KEY);
private static final SecretKeySpec keySpec = AES.newSecretKeySpec(KEY);
private static final IvParameterSpec ivSpec = new IvParameterSpec(IV);
private static final byte[] BUFFER = new byte[1000];

Expand Down