Skip to content

Commit f44f360

Browse files
authored
chore: Sync Private Master with Public Master (#59)
1 parent 84f4b1d commit f44f360

File tree

221 files changed

+34282
-21864
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

221 files changed

+34282
-21864
lines changed

.github/workflows/private-ci.yml

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: Private AWS CodeBuild CI
2+
on:
3+
pull_request:
4+
push:
5+
6+
permissions:
7+
id-token: write
8+
contents: read
9+
10+
jobs:
11+
staticAnalysis:
12+
name: Static Analysis
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Configure AWS Credentials
16+
uses: aws-actions/configure-aws-credentials@v2
17+
with:
18+
role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
19+
aws-region: us-west-2
20+
role-duration-seconds: 3600
21+
- name: Run Static Analysis
22+
uses: aws-actions/aws-codebuild-run-build@v1
23+
timeout-minutes: 60
24+
with:
25+
project-name: private-java-esdk
26+
buildspec-override: codebuild/ci/static-analysis.yml
27+
compute-type-override: BUILD_GENERAL1_MEDIUM
28+
image-override: aws/codebuild/amazonlinux2-x86_64-standard:3.0
29+
vectorTests:
30+
name: Vector Tests
31+
runs-on: ubuntu-latest
32+
strategy:
33+
fail-fast: true
34+
matrix:
35+
platform:
36+
- distribution: openjdk
37+
image: "aws/codebuild/standard:3.0"
38+
- distribution: corretto
39+
image: "aws/codebuild/amazonlinux2-x86_64-standard:3.0" # Corretto only runs on AL2
40+
version: [ 8, 11 ]
41+
steps:
42+
- name: Configure AWS Credentials
43+
uses: aws-actions/configure-aws-credentials@v2
44+
with:
45+
role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
46+
aws-region: us-west-2
47+
role-duration-seconds: 3600
48+
- name: Vector Tests ${{ matrix.platform.distribution }}${{ matrix.version }}
49+
uses: aws-actions/aws-codebuild-run-build@v1
50+
timeout-minutes: 60
51+
with:
52+
project-name: private-java-esdk
53+
buildspec-override: codebuild/ci/vectors-ci.yml
54+
compute-type-override: BUILD_GENERAL1_LARGE
55+
image-override: ${{ matrix.platform.image }}
56+
env-vars-for-codebuild: JAVA_ENV_VERSION
57+
env:
58+
JAVA_ENV_VERSION: ${{ matrix.platform.distribution }}${{ matrix.version }}

.github/workflows/repo-sync.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
environment: repo-sync
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v3
1313
- uses: repo-sync/github-sync@v2
1414
name: Sync repo to branch
1515
with:

.github/workflows/run-codebuild-ci.yml

-35
This file was deleted.

.gitignore

+10-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,13 @@ target/
55
.classpath
66
/bin/
77
.idea/
8-
*.iml
8+
*.iml
9+
/.history
10+
/.DS_Store
11+
/specification_compliance_report.html
12+
13+
## semantic-release
14+
package-lock.json
15+
package.json
16+
node_modules/
17+
pom.xml.versionsBackup

.gitmodules

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "src/test/resources/aws-encryption-sdk-test-vectors"]
22
path = src/test/resources/aws-encryption-sdk-test-vectors
3-
url = https://github.com/awslabs/private-aws-encryption-sdk-test-vectors-staging.git
3+
url = https://github.com/awslabs/aws-encryption-sdk-test-vectors.git
4+
[submodule "aws-encryption-sdk-specification"]
5+
path = aws-encryption-sdk-specification
6+
url = https://github.com/awslabs/aws-encryption-sdk-specification.git

.releaserc

+64
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
## Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
2+
## SPDX-License-Identifier: Apache-2.0
3+
{
4+
"branches": ["master"],
5+
"plugins": [
6+
["@semantic-release/commit-analyzer", {
7+
"preset": "conventionalcommits",
8+
"parserOpts": {
9+
"noteKeywords": ["BREAKING CHANGE", "BREAKING CHANGES"]
10+
},
11+
"presetConfig": {
12+
"types": [
13+
{"type": "feat", "section": "Features"},
14+
{"type": "fix", "section": "Fixes"},
15+
{"type": "chore", "section": "Maintenance"},
16+
{"type": "docs", "section": "Maintenance"},
17+
{"type": "revert", "section": "Fixes"},
18+
{"type": "style", "hidden": true},
19+
{"type": "refactor", "hidden": true},
20+
{"type": "perf", "hidden": true},
21+
{"type": "test", "hidden": true}
22+
]
23+
},
24+
"releaseRules": [
25+
{"type": "docs", "release": "patch"},
26+
{"type": "revert", "release": "patch"},
27+
{"type": "chore", "release": "patch"}
28+
]
29+
}],
30+
["@semantic-release/release-notes-generator", {
31+
"preset": "conventionalcommits",
32+
"parserOpts": {
33+
"noteKeywords": ["BREAKING CHANGE", "BREAKING CHANGES"]
34+
},
35+
"presetConfig": {
36+
"types": [
37+
{"type": "feat", "section": "Features"},
38+
{"type": "fix", "section": "Fixes"},
39+
{"type": "chore", "section": "Maintenance"},
40+
{"type": "docs", "section": "Maintenance"},
41+
{"type": "revert", "section": "Fixes"},
42+
{"type": "style", "hidden": true},
43+
{"type": "refactor", "hidden": true},
44+
{"type": "perf", "hidden": true},
45+
{"type": "test", "hidden": true}
46+
]
47+
}
48+
}],
49+
["@semantic-release/changelog", {
50+
"changelogFile": "./CHANGELOG.md",
51+
"changelogTitle": "# Changelog"
52+
}],
53+
["@semantic-release/exec", {
54+
"prepareCmd": "mvn versions:set -DnewVersion=${nextRelease.version} \
55+
-DautoVersionSubmodules=true && find README.md -type f \
56+
-exec sed -i 's/<version>.*<\\/version>/<version>${nextRelease.version}<\\/version>/g' {} \\;"
57+
}],
58+
["@semantic-release/git", {
59+
"assets": ["./CHANGELOG.md", "./pom.xml", "./README.md"],
60+
"message": "AWS Encryption SDK ${nextRelease.version} Release -- $(date +%Y-%m-%d) \n\n${nextRelease.notes}"
61+
}],
62+
],
63+
"repositoryUrl": "https://github.com/aws/aws-encryption-sdk-java",
64+
}

0 commit comments

Comments
 (0)