Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/pip/flask-3.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
jtherrmann authored Jul 1, 2024
2 parents bb7e9f6 + ee7bb02 commit 5a9657f
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.TOOLS_BOT_PAK }}
Expand All @@ -35,13 +35,13 @@ jobs:
echo "STACK_NAME=hyp3-event-monitoring" >> $GITHUB_ENV
echo "HYP3_URL=https://hyp3-api.asf.alaska.edu" >> $GITHUB_ENV
- uses: aws-actions/configure-aws-credentials@v1
- uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ env.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ env.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ env.AWS_REGION }}

- uses: actions/setup-python@v1
- uses: actions/setup-python@v5
with:
python-version: 3.12

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
cfn-lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4.1.7
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: 3.12
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ jobs:
pytest:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: actions/setup-python@v1
- uses: actions/setup-python@v5
with:
python-version: 3.12

Expand Down
4 changes: 2 additions & 2 deletions requirements-all.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
boto3==1.34.135
boto3==1.34.136
cfn-lint==1.4.2
flake8==7.1.0
flake8-blind-except==0.2.1
flake8-builtins==2.5.0
flake8-import-order==0.18.2
pytest==8.2.2
moto==5.0.10.dev36
moto==5.0.10
responses==0.25.3
pyYAML==6.0.1
-r requirements-find-new.txt
Expand Down

0 comments on commit 5a9657f

Please sign in to comment.