Skip to content
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
10 changes: 5 additions & 5 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v2
- uses: actions/checkout@v4
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: "11"
distribution: "adopt"
java-version: "21"
distribution: "temurin"
- run: gradle build
- run: gradle test
4 changes: 2 additions & 2 deletions .github/workflows/discord-notification.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
issues: write
pull-requests: write
steps:
- uses: "Ilshidur/[email protected].0"
- uses: "Ilshidur/[email protected].2"
env:
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
if: ${{ github.event_name == 'pull_request' }}
Expand All @@ -24,7 +24,7 @@ jobs:
A new PR {{ EVENT_PAYLOAD.pull_request.title }}
by {{ EVENT_PAYLOAD.sender.login}}
at {{ EVENT_PAYLOAD.pull_request.html_url }}
- uses: "Ilshidur/[email protected].0"
- uses: "Ilshidur/[email protected].2"
env:
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
if: ${{ github.event_name == 'issues' }}
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@ jobs:
new_release_notes: ${{ steps.semantic.outputs.new_release_notes }}

steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v2
- uses: actions/checkout@v4
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: "11"
distribution: "adopt"
java-version: "21"
distribution: "temurin"
- run: gradle build test
- uses: cycjimmy/semantic-release-action@v2
- uses: cycjimmy/semantic-release-action@v4
id: semantic
with:
semantic_version: 17
semantic_version: 24
extra_plugins: |
@google/semantic-release-replace-plugin
@semantic-release/git
Expand All @@ -59,10 +59,10 @@ jobs:
if: ${{ needs.release.outputs.new_release_published == 'true' }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Docker meta
id: docker_meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v5
with:
images: ghcr.io/codingpot/github-org-member-manage-action
tags: |
Expand All @@ -72,22 +72,22 @@ jobs:
type=raw,value=latest

- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3
with:
platforms: all

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3

- name: Login to GitHub Container Registry
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
context: .
file: Dockerfile.build
Expand Down
5 changes: 4 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'application'
id 'io.freefair.lombok' version '6.2.0'
id 'io.freefair.lombok' version '8.+'
}

repositories {
Expand Down Expand Up @@ -33,6 +33,9 @@ application {

test {
useJUnitPlatform()
jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED',
'--add-opens', 'java.base/java.util=ALL-UNNAMED',
'--add-opens', 'java.base/java.util.concurrent=ALL-UNNAMED'
}

jar {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@
public class Diff {
/** Owners to be added. */
private Set<String> newAdmins;

/** Members to be added. */
private Set<String> newMembers;

/** Members to be removed from the org. */
private Set<String> membersToBeDeleted;
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
public class Status {
/** Contains the type of the Status. */
StatusType type;

/** This should be only populated when {@link #type} is not {@link StatusType#OK}. */
Optional<String> errorMessage;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ void setUp() throws IOException {
final GitHub gitHub =
new GitHubBuilder().withOAuthToken(System.getenv("INPUT_GH_TOKEN")).build();
GHOrganization ghOrg = gitHub.getOrganization("codingpot");
service = new GitHubServiceV3Impl(ghOrg, gitHub, /*isDryRun=*/ false);
service = new GitHubServiceV3Impl(ghOrg, gitHub, /* isDryRun= */ false);
}

@Test
Expand Down
7 changes: 6 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
plugins { id("com.diffplug.spotless") version "5.15.0" }
plugins {
id("com.diffplug.spotless") version "7.+"
id("com.github.ben-manes.versions") version "+"
}

repositories { mavenCentral() }

spotless {
java {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
10 changes: 5 additions & 5 deletions gradlew
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

#
# Copyright 2015-2021 the original authors.
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -32,10 +32,10 @@
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions $var�, �${var}�, �${var:-default}�, �${var+SET},
# ${var#prefix}�, �${var%suffix}, and $( cmd );
# * compound commands having a testable exit status, especially case;
# * various built-in commands including command�, �set, and ulimit.
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
Expand Down