Skip to content
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

⚠️ CONFLICT! Lineage pull request for: skeleton #136

Merged
merged 32 commits into from
Nov 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
57b4abe
Update actions/setup-go from v2 to v3
mcdonnnj May 27, 2022
8f68498
Update the version of Go used from 1.16 to 1.18
mcdonnnj May 27, 2022
fc55e84
Update the version of Go used from 1.18 to 1.19
mcdonnnj Nov 8, 2022
ec83308
Merge pull request #113 from cisagov/improvement/update_go_configuration
mcdonnnj Nov 8, 2022
2775dfa
Bump hashicorp/setup-terraform from 1 to 2
dependabot[bot] Nov 8, 2022
4925eb1
Merge pull request #111 from cisagov/dependabot/github_actions/hashic…
mcdonnnj Nov 8, 2022
1f7c62e
Bump actions/setup-python from 3 to 4
dependabot[bot] Nov 8, 2022
f74b4a3
Merge pull request #115 from cisagov/dependabot/github_actions/action…
mcdonnnj Nov 8, 2022
6a9c630
Add an ownership comment to the Dependabot configuration
mcdonnnj May 27, 2022
dfd54e9
Add additional Dependabot ignore directives
mcdonnnj May 27, 2022
a8bcddd
Merge pull request #112 from cisagov/improvement/update_dependabot_ig…
mcdonnnj Nov 8, 2022
71a88a5
Remove usage of set-output from our GitHub Actions workflow
mcdonnnj Oct 11, 2022
0867685
Merge pull request #119 from cisagov/bug/update_github_actions_workflow
mcdonnnj Nov 8, 2022
21a68f4
Enable the allow-non-breakable-inline-mappings rule for yamllint
mcdonnnj Sep 7, 2022
3547c4f
Increase the maximum line length in the yamllint configuration
mcdonnnj Sep 7, 2022
cfa9ba5
Merge pull request #117 from cisagov/improvement/update_yamllint_line…
mcdonnnj Nov 8, 2022
b1ea3d4
Fix the repo of the flake8 pre-commit hook
mcdonnnj Oct 14, 2022
2a98c6a
Merge pull request #120 from cisagov/bug/verify_pre-commit_hook_repos
mcdonnnj Nov 8, 2022
fb8d13f
Update pre-commit hooks
mcdonnnj May 27, 2022
bb9c2a0
Merge pull request #114 from cisagov/maintenance/update_pre-commit_hooks
mcdonnnj Nov 8, 2022
e5fbd70
Add a label configuration file
mcdonnnj Oct 5, 2022
b9792a8
Add a workflow to synchronize repository labels
mcdonnnj Oct 5, 2022
161c4ae
Remove duplicate label
jsf9k Oct 21, 2022
5993231
Add a label for issues or PRs that involve test code
jsf9k Oct 21, 2022
c4fbf20
Merge pull request #118 from cisagov/improvement/add_label_sync_workflow
mcdonnnj Nov 8, 2022
6cc53dc
Fix GitHub label color values
mcdonnnj Nov 9, 2022
8f12635
Correct spacing in yamllint rules
mcdonnnj Nov 9, 2022
e803e1a
Merge pull request #122 from cisagov/bug/fix_bad_configurations
mcdonnnj Nov 9, 2022
bade9e2
Merge remote-tracking branch 'skeleton-generic/develop' into lineage/…
jsf9k Nov 9, 2022
663dd87
Add repository specific label
mcdonnnj Nov 14, 2022
3aa675e
Update Python setup in the test job for GHA
mcdonnnj Nov 14, 2022
827ff50
Remove uses of the `set-output` command
mcdonnnj Nov 15, 2022
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: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,13 @@ updates:
schedule:
interval: "weekly"
ignore:
# Managed by cisagov/skeleton-generic
- dependency-name: actions/cache
- dependency-name: actions/checkout
- dependency-name: actions/setup-go
- dependency-name: actions/setup-python
- dependency-name: hashicorp/setup-terraform
- dependency-name: mxschmitt/action-tmate
# Managed by cisagov/skeleton-docker
# - dependency-name: actions/download-artifact
# - dependency-name: actions/github-script
Expand Down
70 changes: 70 additions & 0 deletions .github/labels.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
---
# Rather than breaking up descriptions into multiline strings we disable that
# specific rule in yamllint for this file.
# yamllint disable rule:line-length
- color: "eb6420"
description: This issue or pull request is awaiting the outcome of another issue or pull request
name: blocked
- color: "000000"
description: This issue or pull request involves changes to existing functionality
name: breaking change
- color: "d73a4a"
description: This issue or pull request addresses broken functionality
name: bug
- color: "07648d"
description: This issue will be advertised on code.gov's Open Tasks page (https://code.gov/open-tasks)
name: code.gov
- color: "0366d6"
description: Pull requests that update a dependency file
name: dependencies
- color: "2497ed"
description: Pull requests that update Docker code
name: docker
- color: "5319e7"
description: This issue or pull request improves or adds to documentation
name: documentation
- color: "cfd3d7"
description: This issue or pull request already exists or is covered in another issue or pull request
name: duplicate
- color: "b005bc"
description: A high-level objective issue encompassing multiple issues instead of a specific unit of work
name: epic
- color: "000000"
description: Pull requests that update GitHub Actions code
name: github-actions
- color: "0e8a16"
description: This issue or pull request is well-defined and good for newcomers
name: good first issue
- color: "ff7518"
description: Pull request that should count toward Hacktoberfest participation
name: hacktoberfest-accepted
- color: "a2eeef"
description: This issue or pull request will add or improve functionality, maintainability, or ease of use
name: improvement
- color: "fef2c0"
description: This issue or pull request is not applicable, incorrect, or obsolete
name: invalid
- color: "ce099a"
description: This pull request is ready to merge during the next Lineage Kraken release
name: kraken 🐙
- color: "a4fc5d"
description: This issue or pull request requires further information
name: need info
- color: "fcdb45"
description: This pull request is awaiting an action or decision to move forward
name: on hold
- color: "ef476c"
description: This issue is a request for information or needs discussion
name: question
- color: "00008b"
description: This issue or pull request adds or otherwise modifies test code
name: test
- color: "1d76db"
description: This issue or pull request pulls in upstream updates
name: upstream update
- color: "d4c5f9"
description: This issue or pull request increments the version number
name: version bump
- color: "ffffff"
description: This issue will not be incorporated
name: wontfix
28 changes: 12 additions & 16 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,28 +45,24 @@ jobs:
uses: cisagov/setup-env-github-action@develop
- uses: actions/checkout@v3
- id: setup-python
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: "3.10"
# We need the Go version and Go cache location for the actions/cache step,
# so the Go installation must happen before that.
- uses: actions/setup-go@v2
- id: setup-go
uses: actions/setup-go@v3
with:
go-version: "1.16"
- name: Store installed Go version
id: go-version
run: |
echo "::set-output name=version::"\
"$(go version | sed 's/^go version go\([0-9.]\+\) .*/\1/')"
go-version: "1.19"
- name: Lookup Go cache directory
id: go-cache
run: |
echo "::set-output name=dir::$(go env GOCACHE)"
echo "dir=$(go env GOCACHE)" >> $GITHUB_OUTPUT
- uses: actions/cache@v3
env:
BASE_CACHE_KEY: "${{ github.job }}-${{ runner.os }}-\
py${{ steps.setup-python.outputs.python-version }}-\
go${{ steps.go-version.outputs.version }}-\
go${{ steps.setup-go.outputs.go-version }}-\
packer${{ steps.setup-env.outputs.packer-version }}-\
tf${{ steps.setup-env.outputs.terraform-version }}-"
with:
Expand Down Expand Up @@ -102,7 +98,7 @@ jobs:
${{ env.CURL_CACHE_DIR }}/"${PACKER_ZIP}"
sudo mv /usr/local/bin/packer /usr/local/bin/packer-default
sudo ln -s /opt/packer/packer /usr/local/bin/packer
- uses: hashicorp/setup-terraform@v1
- uses: hashicorp/setup-terraform@v2
with:
terraform_version: ${{ steps.setup-env.outputs.terraform-version }}
- name: Install shfmt
Expand Down Expand Up @@ -219,9 +215,9 @@ jobs:
do
TAGS="${TAGS},ghcr.io/${i}"
done
echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
echo ::set-output name=source_version::$(./bump_version.sh show)
echo ::set-output name=tags::${TAGS}
echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
echo "source_version=$(./bump_version.sh show)" >> $GITHUB_OUTPUT
echo "tags=${TAGS}" >> $GITHUB_OUTPUT
echo tags=${TAGS}
- name: Setup tmate debug session
uses: mxschmitt/action-tmate@v3
Expand Down Expand Up @@ -305,9 +301,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- id: setup-python
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: 3.9
python-version: "3.10"
- name: Cache testing environments
uses: actions/cache@v3
env:
Expand Down
29 changes: 29 additions & 0 deletions .github/workflows/sync-labels.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
name: sync-labels

on:
push:
paths:
- '.github/labels.yml'
- '.github/workflows/sync-labels.yml'

permissions:
contents: read

jobs:
labeler:
permissions:
# actions/checkout needs this to fetch code
contents: read
# crazy-max/ghaction-github-labeler needs this to manage repository labels
issues: write
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Sync repository labels
if: success()
uses: crazy-max/ghaction-github-labeler@v4
with:
# This is a hideous ternary equivalent so we only do a dry run unless
# this workflow is triggered by the develop branch.
dry-run: ${{ github.ref_name == 'develop' && 'false' || 'true' }}
26 changes: 13 additions & 13 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ default_language_version:

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.1.0
rev: v4.3.0
hooks:
- id: check-case-conflict
- id: check-executables-have-shebangs
Expand All @@ -32,32 +32,32 @@ repos:

# Text file hooks
- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.31.1
rev: v0.32.2
hooks:
- id: markdownlint
args:
- --config=.mdl_config.yaml
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.6.1
rev: v3.0.0-alpha.4
hooks:
- id: prettier
- repo: https://github.com/adrienverge/yamllint
rev: v1.26.3
rev: v1.28.0
hooks:
- id: yamllint
args:
- --strict

# GitHub Actions hooks
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.14.2
rev: 0.18.4
hooks:
- id: check-github-actions
- id: check-github-workflows

# pre-commit hooks
- repo: https://github.com/pre-commit/pre-commit
rev: v2.17.0
rev: v2.20.0
hooks:
- id: validate_manifest

Expand Down Expand Up @@ -98,11 +98,11 @@ repos:
name: bandit (everything else)
exclude: tests
- repo: https://github.com/psf/black
rev: 22.3.0
rev: 22.10.0
hooks:
- id: black
- repo: https://gitlab.com/pycqa/flake8
rev: 3.9.2
- repo: https://github.com/PyCQA/flake8
rev: 5.0.4
hooks:
- id: flake8
additional_dependencies:
Expand All @@ -112,11 +112,11 @@ repos:
hooks:
- id: isort
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.942
rev: v0.990
hooks:
- id: mypy
- repo: https://github.com/asottile/pyupgrade
rev: v2.31.1
rev: v3.2.0
hooks:
- id: pyupgrade

Expand All @@ -129,14 +129,14 @@ repos:

# Terraform hooks
- repo: https://github.com/antonbabenko/pre-commit-terraform
rev: v1.64.0
rev: v1.76.0
hooks:
- id: terraform_fmt
- id: terraform_validate

# Docker hooks
- repo: https://github.com/IamTheFij/docker-pre-commit
rev: v2.1.0
rev: v2.1.1
hooks:
- id: docker-compose-check

Expand Down
10 changes: 10 additions & 0 deletions .yamllint
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,16 @@ rules:
# this behavior.
comments-indentation: disable

# yamllint does not allow inline mappings that exceed the line length by
# default. There are many scenarios where the inline mapping may be a key,
# hash, or other long value that would exceed the line length but cannot
# reasonably be broken across lines.
line-length:
# This rule implies the allow-non-breakable-words rule
allow-non-breakable-inline-mappings: true
# Allows a 10% overage from the default limit of 80
max: 88

# yamllint doesn't like when we use yes and no for true and false,
# but that's pretty standard in Ansible.
truthy: disable