Skip to content

Commit

Permalink
feat: upgrade for Dec 23 (#41)
Browse files Browse the repository at this point in the history
* feat: update command line tools to v10406996

* chore: update README

* chore(CI): update Ubuntu version for runner

* feat: add dependabot configuration for auto-updates
  • Loading branch information
beevelop authored Dec 30, 2023
1 parent 8f4010a commit 1eceb3d
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 13 deletions.
12 changes: 12 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
open-pull-requests-limit: 1
- package-ecosystem: "docker"
directory: "/"
schedule:
interval: "daily"
open-pull-requests-limit: 1
13 changes: 1 addition & 12 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:

jobs:
main:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
timeout-minutes: 20
steps:
- name: Check out the repo
Expand Down Expand Up @@ -54,14 +54,3 @@ jobs:
labels: ${{ steps.docker_meta.outputs.labels }}
# cache-from: type=local,src=${{ github.workspace }}/cache
# cache-to: type=local,dest=${{ github.workspace }}/cache
# - name: Run Trivy vulnerability scanner
# uses: aquasecurity/[email protected]
# with:
# image-ref: ${{ env.imageName }}:${{ steps.docker_meta.outputs.version }}
# format: "template"
# template: "@/contrib/sarif.tpl"
# output: "trivy-results.sarif"
# - name: Upload Trivy scan results to GitHub Security tab
# uses: github/codeql-action/upload-sarif@v1
# with:
# sarif_file: "trivy-results.sarif"
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM beevelop/java

# https://developer.android.com/studio/#downloads
ENV ANDROID_SDK_URL="https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip" \
ENV ANDROID_SDK_URL="https://dl.google.com/android/repository/commandlinetools-linux-10406996_latest.zip" \
ANDROID_BUILD_TOOLS_VERSION=34.0.0 \
ANT_HOME="/usr/share/ant" \
MAVEN_HOME="/usr/share/maven" \
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ The usage of the Android SDK requires you to accept the licenses

- [Command Line Tools Download](https://developer.android.com/studio#span-idcommand-toolsa-namecmdline-toolsacommand-line-tools-onlyspan)
- List build-tools versions: `sdkmanager --sdk_root=${ANDROID_SDK_ROOT} --list | grep build-tools`
- [SDK Build Tools release notes](https://developer.android.com/tools/releases/build-tools)
- List platforms: `sdkmanager --sdk_root=${ANDROID_SDK_ROOT} --list | grep 'platforms:'`

---
Expand Down

0 comments on commit 1eceb3d

Please sign in to comment.