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
13 changes: 9 additions & 4 deletions .asf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ github:
# Enforce squashing while merging PRs.
# Otherwise, the git log gets polluted severely.
enabled_merge_buttons:
squash: true
merge: false
rebase: false
squash: true
merge: false
rebase: false

features:
issues: true
Expand All @@ -72,11 +72,16 @@ github:
protected_branches: { }

rulesets:
- name: "Branch protection (2)"
# The `.asf.yaml` processor has a bug that prevents it from parsing existing rulesets.
# So it can neither remove them nor modify them.
# Hence, we bump the counter in the name at each change.
# For details, see: https://github.com/apache/infrastructure-asfyaml/pull/93
- name: "Branch protection (3)"
type: branch
branches:
includes:
- "~DEFAULT_BRANCH"
- "refs/heads/gha/*"
# All reviews must be addressed before merging
required_conversation_resolution: true
# Require checks to pass before merging
Expand Down
49 changes: 34 additions & 15 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,33 +17,52 @@

version: 2

# Add Maven Central explicitly to work around:
# https://github.com/dependabot/dependabot-core/issues/8329
registries:
maven-central:
type: maven-repository
url: https://repo.maven.apache.org/maven2

updates:

# region `main` updates

- package-ecosystem: maven
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 10
registries:
- maven-central
interval: monthly
groups:
dependencies:
patterns: [ "*" ]
target-branch: "main"

- package-ecosystem: github-actions
directory: "/"
schedule:
interval: daily
interval: weekly
cooldown:
default-days: 7
groups:
dependencies:
patterns: [ "*" ]
target-branch: "main"

- package-ecosystem: npm
directory: "/"
schedule:
interval: monthly
groups:
all:
patterns:
- "*"
dependencies:
patterns: [ "*" ]
target-branch: "main"

# endregion

# region `gha/v0` updates

- package-ecosystem: github-actions
directory: "/"
schedule:
interval: weekly
cooldown:
default-days: 7
groups:
dependencies:
patterns: [ "*" ]
target-branch: "gha/v0"

# endregion
214 changes: 0 additions & 214 deletions .github/workflows/build-reusable.yaml

This file was deleted.

11 changes: 3 additions & 8 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,9 @@ on:
- "main"
- "release/*"
paths-ignore:
- "**.adoc"
- "**.md"
- "**.txt"
pull_request:
paths-ignore:
- "**.adoc"
- "**.md"
- "**.txt"

# If the branch is `main`, run once per commit.
# If the branch is `release/*`, allow only one concurrent run.
Expand All @@ -46,14 +41,14 @@ jobs:

build:
if: github.actor != 'dependabot[bot]'
uses: ./.github/workflows/build-reusable.yaml
uses: apache/logging-parent/.github/workflows/build-reusable.yaml@gha/v0
with:
site-enabled: true

deploy-snapshot:
needs: build
if: github.repository == 'apache/logging-parent' && github.ref_name == 'main'
uses: ./.github/workflows/deploy-snapshot-reusable.yaml
uses: apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@gha/v0
# Secrets for deployments
secrets:
NEXUS_USERNAME: ${{ secrets.NEXUS_USER }}
Expand All @@ -62,7 +57,7 @@ jobs:
deploy-release:
needs: build
if: github.repository == 'apache/logging-parent' && startsWith(github.ref_name, 'release/')
uses: ./.github/workflows/deploy-release-reusable.yaml
uses: apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@gha/v0
# Secrets for deployments
secrets:
GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
Expand Down
Loading
Loading