Skip to content

Commit

Permalink
Merge branch 'main' into jarsigner
Browse files Browse the repository at this point in the history
  • Loading branch information
thomasleplus committed Dec 16, 2024
2 parents cb95088 + 26cf00f commit 65b66e1
Show file tree
Hide file tree
Showing 39 changed files with 1,471 additions and 1,453 deletions.
74 changes: 74 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
---
name: Bug report
description: Create a bug report.
title: "[Bug] "
labels:
- bug
assignees:
- thomasleplus
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report!
- type: checkboxes
attributes:
label: Is there an existing issue for this?
description: Search to see if an issue already exists for the bug you encountered.
options:
- label: I have searched the existing issues
required: true
- type: textarea
attributes:
label: Current Behavior
description: A concise description of what you're experiencing.
validations:
required: true
- type: textarea
attributes:
label: Expected Behavior
description: A concise description of what you expected to happen.
validations:
required: true
- type: textarea
attributes:
label: version
description: |
Version where you observed this issue
placeholder: |
vX.Y.Z
render: markdown
validations:
required: true
- type: textarea
id: logs
attributes:
label: Relevant log output
description: |
Copy and paste any relevant log output.
This will be automatically formatted into code, so no need for backticks.
Enable debug logging, either on GitHub Actions, or when running locally.
render: shell
validations:
required: true
- type: textarea
attributes:
label: Steps To Reproduce
description: |
Steps to reproduce the issue.
placeholder: |
1. In this environment...
1. With this config...
1. Run '...'
1. See error...
validations:
required: true
- type: textarea
attributes:
label: Anything else?
description: |
Links? References? Anything that will give us more context about the issue you are encountering!
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
validations:
required: false
14 changes: 0 additions & 14 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

31 changes: 31 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
---
name: Feature request
description: Suggest a new feature for this project.
title: "[Feature] "
labels:
- enhancement
assignees:
- thomasleplus
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this feature request!
- type: textarea
attributes:
label: Feature description
description: |
A clear and concise description of what the desired feature is and why it would be useful.
render: markdown
validations:
required: true
- type: textarea
attributes:
label: Anything else?
description: |
If you think that there are some implementation details to be taken into consideration, or anything that is not obvious from the previous description, please specify it here.
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
render: markdown
validations:
required: false
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/question.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Question
description: Ask a question.
title: "[Question] "
labels:
- question
assignees:
- thomasleplus
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this feature request!
- type: textarea
attributes:
label: What is your question?
description: Please include as many details and examples as possible.
render: markdown
validations:
required: true
10 changes: 7 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
# Copyright 2016-present Thomas Leplus
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand All @@ -19,6 +19,10 @@ updates:
directory: "/"
schedule:
interval: "daily"
- package-ecosystem: "docker"
directory: "/"
schedule:
interval: "daily"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
Expand Down
32 changes: 21 additions & 11 deletions .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,19 @@
---
# Copyright 2016-present Thomas Leplus
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
name: 'Dependabot auto-merge'
name: "Dependabot auto-merge"
on: pull_request

permissions:
Expand All @@ -31,8 +25,24 @@ jobs:
runs-on: ubuntu-latest
if: ${{ github.actor == 'dependabot[bot]' }}
steps:
- name: Authenticate CLI with a PAT
env:
RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
if: env.RELEASE_TOKEN != ''
run: echo "${RELEASE_TOKEN}" | gh auth login --with-token
- name: Enable auto-merge for Dependabot PRs
run: gh pr merge --auto --merge "$PR_URL"
run: |
# Checking the PR title is a poor substitute for the actual PR changes
# but as long as this is used only with dependabot PRs,
# it should be safe to assume that the title is not misleading.
regexp='^Bump .* from [0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)? to [0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)?( in .*)?$'
if [[ "${PR_TITLE}" =~ $regexp ]]; then
gh pr review --approve "${PR_URL}"
else
echo 'Non-semver upgrade needs manual review'
fi
gh pr merge --auto --squash "${PR_URL}"
env:
PR_TITLE: ${{github.event.pull_request.title}}
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
31 changes: 14 additions & 17 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
# Copyright 2016-present Thomas Leplus
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand All @@ -25,7 +25,7 @@ on:
push:
pull_request:
schedule:
- cron: '0 0 * * 0'
- cron: "0 0 * * 0"
workflow_dispatch:

permissions: {}
Expand All @@ -36,10 +36,7 @@ jobs:
runs-on: ubuntu-latest
# Ignore PRs coming from forks or from dependabot since they don't
# have the required permissions.
if: |
${{ (github.event_name != 'pull_request'
|| github.event.pull_request.head.repo.full_name == github.repository)
&& github.actor != 'dependabot[bot]' }}
if: ${{ (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && github.actor != 'dependabot[bot]' }}
permissions:
actions: read
contents: read
Expand All @@ -48,7 +45,7 @@ jobs:
strategy:
fail-fast: false
matrix:
language: ['java']
language: ["java"]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java',
# 'javascript', 'python' ]
# Learn more:
Expand All @@ -58,11 +55,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or
Expand All @@ -76,18 +73,18 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++,
# C#, or Java). If this step fails, then you should remove it
# and run the build manually (see below)
- name: Set up JDK 17
uses: actions/setup-java@v3
- name: Set up JDK 8
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
with:
distribution: temurin
java-version: 17
java-version: 8
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the
# ✏️ If the Autobuild fails above, remove it and uncomment the
# following three lines and modify them (or add more) to
# build your code if your project uses a compiled language

Expand All @@ -96,4 +93,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
16 changes: 8 additions & 8 deletions .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
# Copyright 2016-present Thomas Leplus
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand All @@ -19,7 +19,7 @@
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
name: 'Dependency Review'
name: "Dependency Review"
on: [pull_request]

permissions:
Expand All @@ -29,7 +29,7 @@ jobs:
dependency-review:
runs-on: ubuntu-latest
steps:
- name: 'Checkout Repository'
uses: actions/checkout@v3
- name: 'Dependency Review'
uses: actions/dependency-review-action@v3
- name: "Checkout Repository"
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: "Dependency Review"
uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0
Loading

0 comments on commit 65b66e1

Please sign in to comment.