Skip to content

fix(ci): regenerate workflows from pinned Velnor #330

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.

Sign up for GitHub

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

Closed
donbeave wants to merge 4 commits into from
Closed

fix(ci): regenerate workflows from pinned Velnor #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ed04d43
fix(ci): regenerate workflows from pinned Velnor
donbeave Oct 5, 2026
dbc2d83
fix(build): remove conflict markers from version catalog
donbeave Oct 5, 2026
09f0963
style: fix settings script formatting
donbeave Oct 5, 2026
54ccb50
fix(spring): support Boot 3 and 4 GraphQL ordering
donbeave Oct 5, 2026
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
4 changes: 2 additions & 2 deletions .github/ci/.github-actions-generator-state
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ generator 49
[outputs]
.github/actionlint.yaml ec35f48ae7e90e0e
.github/ci/project.toml b19da7b7165e2f66
.github/workflows/ci-main.yml 7b55f4df4a234985
.github/workflows/ci-policy.yml a9a48676140ac8dd
.github/workflows/ci-main.yml 9674edd8e9649bc5
.github/workflows/ci-policy.yml 29d78b9957b5e17f
.github/workflows/ci-pr.yml aa0b4d40949af2ad
.github/workflows/ci-unit-gradle.yml a8a769d0f75f737d
.github/workflows/maintenance.yml 44cdcd6db1e77d43
Expand Down
15 changes: 2 additions & 13 deletions .github/workflows/ci-main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,24 +176,13 @@ jobs:
env:
GH_TOKEN: ${{ github.token }}
DEFAULT_BRANCH: main
DECLARED_RULESET_CONTEXTS: DCO,Policy,ci-required
run: |
set -euo pipefail
stderr="$(mktemp)"
trap 'rm -f "$stderr"' EXIT
if contexts="$(gh api "repos/$GITHUB_REPOSITORY/rulesets?includes_parents=true" 2>"$stderr" \
contexts="$(gh api "repos/$GITHUB_REPOSITORY/rulesets?includes_parents=true" \
| jq -r '.[] | select(.target == "branch" and .enforcement == "active") | .id' \
| while read -r id; do gh api "repos/$GITHUB_REPOSITORY/rulesets/$id"; done \
| jq -r --arg branch "refs/heads/$DEFAULT_BRANCH" 'select(.conditions.ref_name.include | any(. == "~DEFAULT_BRANCH" or . == "~ALL" or . == $branch)) | .rules[] | select(.type == "required_status_checks") | .parameters.required_status_checks[].context' \
| sort -u | paste -sd, -)"; then
:
elif grep -qE '(HTTP 403|Upgrade to GitHub Team)' "$stderr"; then
echo "::warning::rulesets API returned 403; falling back to declared contexts [$DECLARED_RULESET_CONTEXTS]"
contexts="$DECLARED_RULESET_CONTEXTS"
else
cat "$stderr" >&2
exit 1
fi
| sort -u | paste -sd, -)"
echo "RULESET_CONTEXTS=$contexts" >> "$GITHUB_ENV"
- name: Enforce workflow policy
env:
Expand Down
15 changes: 2 additions & 13 deletions .github/workflows/ci-policy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,24 +80,13 @@ jobs:
env:
GH_TOKEN: ${{ github.token }}
DEFAULT_BRANCH: main
DECLARED_RULESET_CONTEXTS: DCO,Policy,ci-required
run: |
set -euo pipefail
stderr="$(mktemp)"
trap 'rm -f "$stderr"' EXIT
if contexts="$(gh api "repos/$GITHUB_REPOSITORY/rulesets?includes_parents=true" 2>"$stderr" \
contexts="$(gh api "repos/$GITHUB_REPOSITORY/rulesets?includes_parents=true" \
| jq -r '.[] | select(.target == "branch" and .enforcement == "active") | .id' \
| while read -r id; do gh api "repos/$GITHUB_REPOSITORY/rulesets/$id"; done \
| jq -r --arg branch "refs/heads/$DEFAULT_BRANCH" 'select(.conditions.ref_name.include | any(. == "~DEFAULT_BRANCH" or . == "~ALL" or . == $branch)) | .rules[] | select(.type == "required_status_checks") | .parameters.required_status_checks[].context' \
| sort -u | paste -sd, -)"; then
:
elif grep -qE '(HTTP 403|Upgrade to GitHub Team)' "$stderr"; then
echo "::warning::rulesets API returned 403; falling back to declared contexts [$DECLARED_RULESET_CONTEXTS]"
contexts="$DECLARED_RULESET_CONTEXTS"
else
cat "$stderr" >&2
exit 1
fi
| sort -u | paste -sd, -)"
echo "RULESET_CONTEXTS=$contexts" >> "$GITHUB_ENV"
- name: Enforce workflow policy
env:
Expand Down
9 changes: 0 additions & 9 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,8 @@ kotest = "6.1.11"
graphql-java = "26.0"
graphql-kickstart-spring-boot = "15.1.0"
commons-text = "1.15.0"
<<<<<<< HEAD
spring-boot = "4.0.6"
=======
<<<<<<< HEAD
spring-boot = "3.5.14"
>>>>>>> origin/main
dgs = "11.1.0"
=======
spring-boot = "3.5.13"
dgs = "12.0.1"
>>>>>>> origin/main

[libraries]
# BOMs
Expand Down
7 changes: 6 additions & 1 deletion ...ain/java/com/tailrocks/graphql/datetime/spring/boot/GraphQlDateTimeAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,12 @@
/**
* @author Alexey Zhokhov
*/
@AutoConfiguration(before = {org.springframework.boot.autoconfigure.graphql.GraphQlAutoConfiguration.class})
@AutoConfiguration(
beforeName = {
"org.springframework.boot.autoconfigure.graphql.GraphQlAutoConfiguration",
"org.springframework.boot.graphql.autoconfigure.GraphQlAutoConfiguration"
}
)
@ConditionalOnClass({org.springframework.graphql.execution.RuntimeWiringConfigurer.class})
public class GraphQlDateTimeAutoConfiguration {

Expand Down
3 changes: 1 addition & 2 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ include(
"graphql-datetime-spring-boot-common",
"graphql-datetime-spring-boot-starter",
"graphql-java-datetime",

// samples
"samples:kickstart-webflux",
"samples:kickstart-webmvc",
"samples:spring-boot-webmvc",
"samples:dgs-webmvc"
"samples:dgs-webmvc",
)
Loading