Resolve Merge Conflicts

This commit is contained in:
Gregory Mitchell 2024-09-11 14:49:52 +00:00 committed by GitHub
commit d3a91fa39c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 93197 additions and 4417 deletions

View file

@ -8,6 +8,7 @@
- [Amazon Corretto](#Amazon-Corretto)
- [Oracle](#Oracle)
- [Alibaba Dragonwell](#Alibaba-Dragonwell)
- [SapMachine](#SapMachine)
- [JetBrains](#JetBrains)
- [Installing custom Java package type](#Installing-custom-Java-package-type)
- [Installing custom Java architecture](#Installing-custom-Java-architecture)
@ -143,6 +144,18 @@ steps:
- run: java -cp java HelloWorldApp
```
### SapMachine
**NOTE:** An OpenJDK release maintained and supported by SAP
```yaml
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: 'sapmachine'
java-version: '21'
- run: java -cp java HelloWorldApp
```
### JetBrains
**NOTE:** JetBrains only provides jdk and is only available for LTS versions 11 or later.
@ -183,7 +196,6 @@ steps:
- run: java -cp java HelloWorldApp
```
## Installing custom Java architecture
```yaml