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 #26

Merged
merged 67 commits into from
Dec 19, 2022
Merged
Show file tree
Hide file tree
Changes from 65 commits
Commits
Show all changes
67 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
8d2691e
Merge pull request #136 from cisagov/lineage/skeleton
mcdonnnj Nov 21, 2022
a856426
Update the version of the second bandit hook
mcdonnnj Nov 21, 2022
0ad31cc
Correct poor English in comments for the bandit pre-commit hooks
mcdonnnj Nov 21, 2022
649ad63
Merge pull request #138 from cisagov/bug/update_bandit_in_pre-commit_…
mcdonnnj Nov 21, 2022
0d24f9c
Update the CodeQL configuration
mcdonnnj Nov 14, 2022
26cfb4e
Merge pull request #137 from cisagov/improvement/update_codeql_workflow
mcdonnnj Nov 21, 2022
87d0f97
Remove dangling argument in the pre-commit configuration
mcdonnnj Jun 30, 2022
eacc476
Update files used for Python requirements by LGTM
mcdonnnj Jun 30, 2022
42f3468
Restore the alerts badging for LGTM
mcdonnnj Jun 30, 2022
c21cacc
Merge pull request #115 from cisagov/improvement/fix_dangling_configu…
mcdonnnj Nov 21, 2022
5589f23
Bump actions/github-script from 5 to 6
dependabot[bot] Nov 21, 2022
362fad5
Merge pull request #77 from cisagov/dependabot/github_actions/actions…
mcdonnnj Nov 21, 2022
1a8ab89
Fix overly match-happy sed commands
jsf9k Sep 13, 2022
8f09cbf
Merge pull request #122 from cisagov/bugfix/tighten-regex-in-version-…
mcdonnnj Nov 21, 2022
ba23619
Prettify a comment
jsf9k Nov 4, 2022
343c0cb
Rework creation of unprivileged user and installation of dependencies
jsf9k Nov 4, 2022
717334c
Add comments and prefer long CLI options
jsf9k Nov 4, 2022
2a72bf6
Move ECHO_MESSAGE declaration to the "Prepare to run" section
jsf9k Nov 4, 2022
6f639fe
Merge pull request #135 from cisagov/improvement/dockerfile
mcdonnnj Nov 21, 2022
8cf8d23
Remove LGTM from the repository
mcdonnnj Nov 22, 2022
81f6c71
Merge pull request #139 from cisagov/maintenance/remove_lgtm
mcdonnnj Nov 22, 2022
8c73bf4
Restore Dockerfile changes from review
mcdonnnj Nov 22, 2022
8de42e4
Merge pull request #140 from cisagov/bug/fix_clobbered_dockerfile
mcdonnnj Nov 22, 2022
d15dee2
Merge remote-tracking branch 'skeleton-docker/develop' into lineage/s…
jsf9k Nov 22, 2022
88c14c9
Remove upgrade of wheel
jsf9k Nov 22, 2022
9a9f092
Remove venv from list of packages to be upgraded via pip3
jsf9k Nov 22, 2022
f8ee358
Bump version from 1.1.15 to 1.1.16
jsf9k Nov 22, 2022
346d3c9
Move trailing logical operators onto the following line
jsf9k Dec 7, 2022
24cf8aa
Restore comment
jsf9k Dec 7, 2022
a16dce5
Add python label
jsf9k Dec 16, 2022
4dea8c0
Remove emojis carried over from skeleton
jsf9k Dec 16, 2022
00ec922
Change a word in a comment to lowercase
jsf9k Dec 16, 2022
bc7aa3c
Correct URL
jsf9k Dec 16, 2022
ee0981e
Bump up the version of libpq-dev being installed
jsf9k Dec 19, 2022
4f47332
Prefer long command line options
jsf9k Dec 19, 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
5 changes: 5 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 All @@ -28,6 +32,7 @@ updates:
- dependency-name: docker/login-action
- dependency-name: docker/setup-buildx-action
- dependency-name: docker/setup-qemu-action
- dependency-name: github/codeql-action

- package-ecosystem: "pip"
directory: "/"
Expand Down
73 changes: 73 additions & 0 deletions .github/labels.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
---
# 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: "3772a4"
description: Pull requests that update Python code
name: python
- color: "ef476c"
jsf9k marked this conversation as resolved.
Show resolved Hide resolved
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
30 changes: 13 additions & 17 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 @@ -178,7 +174,7 @@ jobs:
- uses: actions/checkout@v3
- name: Gather repository metadata
id: repo
uses: actions/github-script@v5
uses: actions/github-script@v6
with:
script: |
const repo = await github.rest.repos.get(context.repo)
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
42 changes: 20 additions & 22 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---

# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
Expand All @@ -11,59 +10,58 @@ on:
push:
# Dependabot triggered push events have read-only access, but uploading code
# scanning requires write access.
branches-ignore: [dependabot/**]
branches-ignore:
- dependabot/**
pull_request:
# The branches below must be a subset of the branches above
branches: [develop]
branches:
- develop
schedule:
- cron: '0 21 * * 6'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest

permissions:
# required for all workflows
security-events: write
strategy:
fail-fast: false
matrix:
# Override automatic language detection by changing the below list
# Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript',
# 'python']
language: ['python']
# Supported options are go, javascript, csharp, python, cpp, and java
language:
- python
# Learn more...
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a
# config file. By default, queries listed here will override any
# specified in a config file. Prefix the list here with "+" to use
# these queries and those in the config file. queries:
# ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or
# 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)
# manually (see below).
- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v2

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

# ✏️ 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
# three lines and modify them (or add more) to build your code if your
# project uses a compiled language

# - run: |
# make bootstrap
# make release
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
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' }}
8 changes: 0 additions & 8 deletions .lgtm.yml

This file was deleted.

Loading