Skip to content

Commit 6ab0b0c

Browse files
committed
feat: enable 17
1 parent 4e24ceb commit 6ab0b0c

File tree

32 files changed

+175
-400
lines changed

32 files changed

+175
-400
lines changed

.github/workflows/release-image.yml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,25 +75,34 @@ jobs:
7575
packages: write
7676
strategy:
7777
matrix:
78-
version: [ '30', '31', '32', '33' ]
79-
variant: [ '', '-emulator', '-ndk', '-stf-client' ]
78+
version: [ '32', '33' ]
79+
variant: [ '', '-emulator', '-ndk', '-stf-client', '-jdk17', '-jdk11' ]
8080
needs: [checks-hadolint, checks-shfmt, checks-shellcheck, checks-update]
8181
steps:
8282
- name: Checkout repository
8383
uses: actions/checkout@v3
8484

85+
- name: Check Exists
86+
id: check-dir
87+
run: |
88+
if [ ! -d ${{ matrix.version }}${{ matrix.variant }} ]; then
89+
echo "Directory ${{ matrix.version }}${{ matrix.variant }} does not exist"
90+
echo "skipdir=true" >> $GITHUB_OUTPUT
91+
fi
92+
8593
- name: Set up Docker Buildx
94+
if: steps.check-dir.outputs.skipdir != 'true'
8695
uses: docker/setup-buildx-action@v2
8796

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

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

103112
- name: Extract metadata (tags, labels) for Docker
104113
id: meta
114+
if: steps.check-dir.outputs.skipdir != 'true'
105115
uses: docker/metadata-action@v4
106116
with:
107117
images: |
@@ -114,6 +124,7 @@ jobs:
114124
115125
- name: Cache Mode
116126
id: cache-mode
127+
if: steps.check-dir.outputs.skipdir != 'true'
117128
run: |
118129
if [ "$VARIANT" == '-emulator' ]; then
119130
echo "::set-output name=mode::min"
@@ -124,6 +135,7 @@ jobs:
124135
VARIANT: ${{ matrix.variant }}
125136

126137
- name: Build and push Docker image
138+
if: steps.check-dir.outputs.skipdir != 'true'
127139
uses: docker/build-push-action@v4
128140
with:
129141
context: ${{ matrix.version }}${{ matrix.variant }}

30-emulator/Dockerfile

Lines changed: 0 additions & 119 deletions
This file was deleted.

30-stf-client/Dockerfile

Lines changed: 0 additions & 117 deletions
This file was deleted.

31-emulator/tools-emulator/android-start-emulator

Lines changed: 0 additions & 9 deletions
This file was deleted.

31-emulator/tools-emulator/android-wait-for-emulator

Lines changed: 0 additions & 30 deletions
This file was deleted.

31/tools/adb-all

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)