Skip to content

Commit 4341abe

Browse files
authored
Merge pull request #37 from menny/new-dev-base-jdk-21
Update release workflow to use softprops/action-gh-release@v2 and bum…
2 parents d0d58ba + dc94429 commit 4341abe

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

.github/versions.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
IMAGE_VERSION=1.22.1
1+
IMAGE_VERSION=1.22.2
22
NDK_VERSION=29.0.14206865
33
BAZELISK_VERSION=v1.27.0

.github/workflows/post_merge_deploy.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,22 +140,25 @@ jobs:
140140
runs-on: ubuntu-24.04
141141
needs:
142142
- green
143+
permissions:
144+
contents: write
143145
steps:
144146
- uses: actions/checkout@v3.5.0
145147
- name: Set versions
146148
uses: tw3lveparsecs/github-actions-set-variables@latest
147149
with:
148150
envFilePath: .github/versions.env
149-
- uses: avakar/tag-and-release@v1
151+
- uses: softprops/action-gh-release@v2
150152
with:
151153
tag_name: ${{ env.IMAGE_VERSION }}
152-
body: >
153-
**Base**: image with JDK17, Android SDK Manager ([Dockerfile](https://github.com/menny/docker_android/blob/${{ env.IMAGE_VERSION }}/android_base/Dockerfile)):<br/>
154+
generate_release_notes: true
155+
body: |
156+
**Base**: image with JDK 21, Android SDK Manager ([Dockerfile](https://github.com/menny/docker_android/blob/${{ env.IMAGE_VERSION }}/android_base/Dockerfile)):<br/>
154157
```
155158
docker pull ghcr.io/menny/android_base:${{ env.IMAGE_VERSION }}
156159
```<br/>
157160
<br/>
158-
**Android**: Base + Build Tools, Platform level 35 ([Dockerfile](https://github.com/menny/docker_android/blob/${{ env.IMAGE_VERSION }}/Dockerfile)):<br/>
161+
**Android**: Base + Build Tools, Platform level 36 ([Dockerfile](https://github.com/menny/docker_android/blob/${{ env.IMAGE_VERSION }}/Dockerfile)):<br/>
159162
```
160163
docker pull ghcr.io/menny/android:${{ env.IMAGE_VERSION }}
161164
```<br/>
@@ -179,7 +182,5 @@ jobs:
179182
```
180183
docker pull ghcr.io/menny/android_dev:${{ env.IMAGE_VERSION }}
181184
```
182-
183-
184185
env:
185186
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)