-
Notifications
You must be signed in to change notification settings - Fork 12
⚠️ CONFLICT! Lineage pull request for: skeleton #154
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
Merged
Merged
Changes from all commits
Commits
Show all changes
29 commits
Select commit
Hold shift + click to select a range
4d88c8b
Add a configuration block for pre-commit.ci
mcdonnnj 3b58427
Use a version tag for cisagov/setup-env-github-action
mcdonnnj f891704
Add a configuration to automatically label pull requests
mcdonnnj 0aba281
Bump actions/labeler from 5 to 6
mcdonnnj 507fe98
Bump actions/setup-python from 5 to 6
dependabot[bot] 428ab61
Bump actions/setup-go from 5 to 6
dependabot[bot] 623a983
Adjust the labels dependabot uses
mcdonnnj 03065cd
Adjust GNU getopt check logic in the `setup-env` script
mcdonnnj dd78561
Merge pull request #212 from cisagov/improvement/use_tag_not_branch
mcdonnnj c2a8218
Merge pull request #216 from cisagov/dependabot/github_actions/action…
mcdonnnj 4f7398e
Merge pull request #217 from cisagov/dependabot/github_actions/action…
mcdonnnj 4d30d44
Merge pull request #213 from cisagov/improvement/add_ci_config_to_pre…
mcdonnnj deb2480
Merge pull request #215 from cisagov/improvement/add_pr_auto_labelling
mcdonnnj ad43910
Merge pull request #218 from cisagov/improvement/adjust_dependabot_la…
mcdonnnj b45b24c
Merge pull request #221 from cisagov/improvement/adjust_gnu_getopt_ch…
mcdonnnj c7e1ce8
Bump actions/checkout from 4 to 5
dependabot[bot] a27070a
Merge pull request #214 from cisagov/dependabot/github_actions/action…
mcdonnnj d070095
Update pre-commit hook versions
mcdonnnj ee20b2a
Conform to new markdownlint rule
mcdonnnj 5bde44c
Bump version from 0.0.1-rc.1 to 1.0.0
mcdonnnj 37010e5
Merge pull request #220 from cisagov/maintenance/update_pre-commit_hooks
mcdonnnj 87ab820
Merge remote-tracking branch 'skeleton/develop' into lineage/skeleton
jsf9k f23025a
Update GitHub actions to versions used upstream
jsf9k f5eb17b
Sync bandit versions used in pre-commit config
jsf9k 187e76b
Add python configuration to labeler
jsf9k 11b2254
Add Python tests and pytest.ini to labeler test configuration
jsf9k bc0278b
Correct version file in labeler configuration
jsf9k b5e805e
Add setup.py as a trigger for the dependencies label
jsf9k 3a57066
Merge branch 'develop' into lineage/skeleton
mcdonnnj File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
--- | ||
# Each entry in this file is a label that will be applied to pull requests | ||
# if there is a match based on the matching rules for the entry. Please see | ||
# the actions/labeler documentation for more information: | ||
# https://github.com/actions/labeler#match-object | ||
# | ||
# Note: Verify that the label you want to use is defined in the | ||
# crazy-max/ghaction-github-labeler configuration file located at | ||
# .github/labels.yml. | ||
|
||
# Enable if Ansible playbooks are used in the repository. | ||
# ansible: | ||
# - changed-files: | ||
# - any-glob-to-any-file: | ||
# - "**/ansible/**" | ||
dependencies: | ||
- changed-files: | ||
- any-glob-to-any-file: | ||
# Add any dependency files used. | ||
- .pre-commit-config.yaml | ||
- requirements*.txt | ||
- setup.py | ||
documentation: | ||
- changed-files: | ||
- any-glob-to-any-file: | ||
- "**/*.md" | ||
github-actions: | ||
- changed-files: | ||
- any-glob-to-any-file: | ||
- .github/workflows/** | ||
# Enable if Packer is used in the repository. | ||
# packer: | ||
# - changed-files: | ||
# - any-glob-to-any-file: | ||
# - "**/*.pkr.hcl" | ||
# Enable if Python is used in the repository. | ||
python: | ||
- changed-files: | ||
- any-glob-to-any-file: | ||
- "**/*.py" | ||
# Enable if Terraform is used in the repository. | ||
# terraform: | ||
# - changed-files: | ||
# - any-glob-to-any-file: | ||
# - "**/*.tf" | ||
test: | ||
- changed-files: | ||
- any-glob-to-any-file: | ||
# Add any test-related files or paths. | ||
- .ansible-lint | ||
- .bandit.yml | ||
- .flake8 | ||
- .isort.cfg | ||
- .mdl_config.yaml | ||
- .yamllint | ||
- pytest.ini | ||
- tests/**/*.py | ||
upstream update: | ||
- head-branch: | ||
# Any Lineage pull requests should use this branch. | ||
- lineage/skeleton | ||
version bump: | ||
- changed-files: | ||
- any-glob-to-any-file: | ||
# Ensure this matches your version tracking file(s). | ||
- src/**/_version.py |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,93 @@ | ||
--- | ||
name: Label pull requests | ||
|
||
on: # yamllint disable-line rule:truthy | ||
pull_request: | ||
types: | ||
- edited | ||
- opened | ||
- synchronize | ||
|
||
# Set a default shell for any run steps. The `-Eueo pipefail` sets errtrace, | ||
# nounset, errexit, and pipefail. The `-x` will print all commands as they are | ||
# run. Please see the GitHub Actions documentation for more information: | ||
# https://docs.github.com/en/actions/using-jobs/setting-default-values-for-jobs | ||
defaults: | ||
run: | ||
shell: bash -Eueo pipefail -x {0} | ||
|
||
jobs: | ||
diagnostics: | ||
name: Run diagnostics | ||
# This job does not need any permissions | ||
permissions: {} | ||
runs-on: ubuntu-latest | ||
steps: | ||
# Note that a duplicate of this step must be added at the top of | ||
# each job. | ||
- name: Apply standard cisagov job preamble | ||
uses: cisagov/action-job-preamble@v1 | ||
with: | ||
check_github_status: "true" | ||
# This functionality is poorly implemented and has been | ||
# causing problems due to the MITM implementation hogging or | ||
# leaking memory. As a result we disable it by default. If | ||
# you want to temporarily enable it, simply set | ||
# monitor_permissions equal to "true". | ||
# | ||
# TODO: Re-enable this functionality when practical. See | ||
# cisagov/skeleton-generic#207 for more details. | ||
monitor_permissions: "false" | ||
output_workflow_context: "true" | ||
# Use a variable to specify the permissions monitoring | ||
# configuration. By default this will yield the | ||
# configuration stored in the cisagov organization-level | ||
# variable, but if you want to use a different configuration | ||
# then simply: | ||
# 1. Create a repository-level variable with the name | ||
# ACTIONS_PERMISSIONS_CONFIG. | ||
# 2. Set this new variable's value to the configuration you | ||
# want to use for this repository. | ||
# | ||
# Note in particular that changing the permissions | ||
# monitoring configuration *does not* require you to modify | ||
# this workflow. | ||
permissions_monitoring_config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }} | ||
label: | ||
needs: | ||
- diagnostics | ||
permissions: | ||
# Permissions required by actions/labeler | ||
contents: read | ||
issues: write | ||
pull-requests: write | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Apply standard cisagov job preamble | ||
uses: cisagov/action-job-preamble@v1 | ||
with: | ||
# This functionality is poorly implemented and has been | ||
# causing problems due to the MITM implementation hogging or | ||
# leaking memory. As a result we disable it by default. If | ||
# you want to temporarily enable it, simply set | ||
# monitor_permissions equal to "true". | ||
# | ||
# TODO: Re-enable this functionality when practical. See | ||
# cisagov/skeleton-generic#207 for more details. | ||
monitor_permissions: "false" | ||
# Use a variable to specify the permissions monitoring | ||
# configuration. By default this will yield the | ||
# configuration stored in the cisagov organization-level | ||
# variable, but if you want to use a different configuration | ||
# then simply: | ||
# 1. Create a repository-level variable with the name | ||
# ACTIONS_PERMISSIONS_CONFIG. | ||
# 2. Set this new variable's value to the configuration you | ||
# want to use for this repository. | ||
# | ||
# Note in particular that changing the permissions | ||
# monitoring configuration *does not* require you to modify | ||
# this workflow. | ||
permissions_monitoring_config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }} | ||
- name: Apply suitable labels to a pull request | ||
uses: actions/labeler@v6 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.