Skip to content

Bump com.google.j2objc:j2objc-annotations from 1.3 to 3.0.0 #11

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

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open
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
9 changes: 8 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,12 @@ version: 2
updates:
- package-ecosystem: "pip"
directory: "/"
open-pull-requests-limit: 2
schedule:
interval: "weekly"
interval: "daily"

- package-ecosystem: "maven"
directory: "/"
open-pull-requests-limit: 2
schedule:
interval: "daily"
38 changes: 29 additions & 9 deletions .github/workflows/privileged-run.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
# This workflow will install Python dependencies, run tests and lint with a single version of Python
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
# This workflow will trigger on pushes, pull requests (to master branch), and manually from the GitHub Actions tab (when requested)
# sample_run uses matrix to create 12 unique combinations of operating systems and python versions
# each of the 12 runs download the jars needed to run the KCL, run the sample_kinesis_wordputter.py, and use a timeout command to run the sample_kclpy_app.py
# auto_merge uses GitHub events to check if dependabot is the pull requester, and if the request fits the criteria the PR is automatically merged

name: Build Intensive
name: Sample Run and Dependabot Auto-merge
on:
push:
branches: [ master ]
pull_request_target:
branches: [ master ]
workflow_dispatch:

permissions:
id-token: write
contents: read
contents: write

jobs:
build-intensive:
sample-run:
timeout-minutes: 8
runs-on: ${{ matrix.os }}
defaults:
Expand All @@ -24,6 +25,7 @@ jobs:
fail-fast: false
matrix:
python-version: [ "3.8", "3.9", "3.10", "3.11" ]
jdk-version: [ "8", "11", "17", "21", "24" ]
os: [ ubuntu-latest, macOS-latest, windows-latest ]

steps:
Expand All @@ -37,10 +39,10 @@ jobs:
role-to-assume: arn:aws:iam::751999266872:role/GitHubWorkflows
role-session-name: myGitHubActions

- name: Set up JDK 8
- name: Set up JDK ${{ matrix.jdk-version }}
uses: actions/setup-java@v4
with:
java-version: '8'
java-version: ${{ matrix.jdk-version }}
distribution: 'corretto'

- name: Set up Python ${{ matrix.python-version }}
Expand Down Expand Up @@ -79,3 +81,21 @@ jobs:
run: |
brew install coreutils
gtimeout 45 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi

auto-merge-dependabot:
needs: [sample-run]
runs-on: ubuntu-latest
if: github.event.pull_request.user.login == 'dependabot[bot]'
steps:
- name: Fetch Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@v2
with:
alert-lookup: true
github-token: "${{ secrets.GITHUB_TOKEN }}"
- name: Enable auto-merge for Dependabot PRs
if: steps.metadata.outputs.update-type != 'version-update:semver-major'
run: gh pr merge --auto --merge "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<properties>
<awssdk.version>2.25.64</awssdk.version>
<kcl.version>3.0.2</kcl.version>
<netty.version>4.1.118.Final</netty.version>
<netty.version>4.2.0.Final</netty.version>
<netty-reactive.version>2.0.6</netty-reactive.version>
<fasterxml-jackson.version>2.13.5</fasterxml-jackson.version>
<logback.version>1.3.15</logback.version>
Expand Down Expand Up @@ -270,7 +270,7 @@
<dependency>
<groupId>com.google.j2objc</groupId>
<artifactId>j2objc-annotations</artifactId>
<version>1.3</version>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.mojo</groupId>
Expand Down
Loading