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.

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

Jdk17 #17

Merged
merged 3 commits into from
May 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 18 additions & 6 deletions .github/workflows/release-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,25 +75,34 @@ jobs:
packages: write
strategy:
matrix:
version: [ '30', '31', '32', '33' ]
variant: [ '', '-emulator', '-ndk', '-stf-client' ]
version: [ '32', '33', '34' ]
variant: [ '', '-emulator', '-ndk', '-stf-client', '-jdk17', '-jdk11' ]
needs: [checks-hadolint, checks-shfmt, checks-shellcheck, checks-update]
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Check Exists
id: check-dir
run: |
if [ ! -d ${{ matrix.version }}${{ matrix.variant }} ]; then
echo "Directory ${{ matrix.version }}${{ matrix.variant }} does not exist"
echo "skipdir=true" >> $GITHUB_OUTPUT
fi

- name: Set up Docker Buildx
if: steps.check-dir.outputs.skipdir != 'true'
uses: docker/setup-buildx-action@v2

- name: Login to Docker Hub
if: github.ref == 'refs/heads/master'
if: steps.check-dir.outputs.skipdir != 'true' && github.ref == 'refs/heads/main'
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}

- name: Login to GAR
if: github.ref == 'refs/heads/master'
if: steps.check-dir.outputs.skipdir != 'true' && github.ref == 'refs/heads/main'
uses: docker/login-action@v2
with:
registry: europe-west1-docker.pkg.dev
Expand All @@ -102,6 +111,7 @@ jobs:

- name: Extract metadata (tags, labels) for Docker
id: meta
if: steps.check-dir.outputs.skipdir != 'true'
uses: docker/metadata-action@v4
with:
images: |
Expand All @@ -110,10 +120,11 @@ jobs:
tags: |
type=raw,value=${{ matrix.version }}${{ matrix.variant }}
flavor: |
latest=${{ toJSON(matrix.version == '31' && matrix.variant == '' && github.ref == 'refs/heads/master') }}
latest=${{ toJSON(matrix.version == '31' && matrix.variant == '' && github.ref == 'refs/heads/main') }}

- name: Cache Mode
id: cache-mode
if: steps.check-dir.outputs.skipdir != 'true'
run: |
if [ "$VARIANT" == '-emulator' ]; then
echo "::set-output name=mode::min"
Expand All @@ -124,10 +135,11 @@ jobs:
VARIANT: ${{ matrix.variant }}

- name: Build and push Docker image
if: steps.check-dir.outputs.skipdir != 'true'
uses: docker/build-push-action@v4
with:
context: ${{ matrix.version }}${{ matrix.variant }}
push: ${{ github.ref == 'refs/heads/master' }}
push: ${{ github.ref == 'refs/heads/main' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
Expand Down
119 changes: 0 additions & 119 deletions 30-emulator/Dockerfile

This file was deleted.

117 changes: 0 additions & 117 deletions 30-stf-client/Dockerfile

This file was deleted.

9 changes: 0 additions & 9 deletions 31-emulator/tools-emulator/android-start-emulator

This file was deleted.

30 changes: 0 additions & 30 deletions 31-emulator/tools-emulator/android-wait-for-emulator

This file was deleted.

19 changes: 0 additions & 19 deletions 31/tools/adb-all

This file was deleted.

Loading
Loading