Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/pip/certifi-2024.7.4
Browse files Browse the repository at this point in the history
  • Loading branch information
ChiefHolland authored Oct 24, 2024
2 parents 659e2b6 + f4d35c4 commit 0b8ddde
Show file tree
Hide file tree
Showing 10 changed files with 148 additions and 152 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout the repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Run the goat
uses: seisollc/goat@main
with:
Expand All @@ -36,25 +36,25 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout the repository
uses: actions/checkout@v3
uses: actions/checkout@v4
# Necessary for hooks to succeed during tests for commits/schedule
if: github.event_name != 'push_request'
with:
fetch-depth: 0
submodules: 'true'
- name: Checkout the repository
uses: actions/checkout@v3
uses: actions/checkout@v4
# Necessary for hooks to succeed during tests for PRs
if: github.event_name == 'pull_request'
with:
ref: ${{ github.event.pull_request.head.ref }}
fetch-depth: 0
submodules: 'true'
- name: Setup python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ env.python_version }}
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.local/share/virtualenvs
key: ${{ runner.os }}-python-${{ env.python_version }}-pipenv-${{ hashFiles('Pipfile.lock') }}
Expand All @@ -68,7 +68,7 @@ jobs:
chmod +x "${RUNNER_TEMP}/bin/grype"
echo "${RUNNER_TEMP}/bin" >> "${GITHUB_PATH}"
- name: Install Task
uses: arduino/setup-task@v1
uses: arduino/setup-task@v2
- name: Initialize the repo
run: task -v init
- name: Validate the repo
Expand All @@ -84,22 +84,22 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout the repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
token: ${{ secrets.SEISO_AUTOMATION_PAT }}
fetch-depth: 0
- name: Setup python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ env.python_version }}
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.local/share/virtualenvs
key: ${{ runner.os }}-python-${{ env.python_version }}-pipenv-${{ hashFiles('Pipfile.lock') }}
- name: Install the dependencies
run: python -m pip install --upgrade pipenv
- name: Install Task
uses: arduino/setup-task@v1
uses: arduino/setup-task@v2
- name: Initialize the repo
run: task -v init
- name: Bump the version
Expand All @@ -111,7 +111,7 @@ jobs:
git push --atomic origin "${BRANCH}" "${TAG}"
echo "tag=${TAG}" >> "${GITHUB_OUTPUT}"
- name: Publish the release to GitHub
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout the repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ env.python_version }}
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.local/share/virtualenvs
key: ${{ runner.os }}-python-${{ env.python_version }}-pipenv-${{ hashFiles('Pipfile.lock') }}
Expand All @@ -31,12 +31,12 @@ jobs:
python -m pip install --upgrade pipenv
echo "CODEQL_PYTHON=$(pipenv run which python)" >> "${GITHUB_ENV}"
- name: Install Task
uses: arduino/setup-task@v1
uses: arduino/setup-task@v2
- name: Initialize the repo
run: task -v init
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
setup-python-dependencies: false
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
8 changes: 4 additions & 4 deletions .github/workflows/update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,24 +22,24 @@ jobs:
pull-requests: write
steps:
- name: Checkout the repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: ${{ env.python_version }}
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.local/share/virtualenvs
key: ${{ runner.os }}-python-${{ env.python_version }}-pipenv-${{ hashFiles('Pipfile.lock') }}
- name: Install the dependencies
run: python -m pip install --upgrade pipenv
- name: Install Task
uses: arduino/setup-task@v1
uses: arduino/setup-task@v2
- name: Initialize the repo
run: task -v init
- name: Update the repository
run: task -v update
- name: Create or update a pull request
uses: peter-evans/create-pull-request@v4
uses: peter-evans/create-pull-request@v6
with:
title: Automated update to primary components
commit-message: Automated update to primary components
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
repos:
- repo: https://github.com/seisollc/goat
rev: 4ac33e8fab47ced142fb708e94530257b7c3b13d # frozen: v2024.04.04
rev: aaca59f98995651447f16527e154ffe92755c568 # frozen: v2024.06.02
hooks:
- id: seiso-lint
Loading

0 comments on commit 0b8ddde

Please sign in to comment.