Skip to content

Commit 7b21fa8

Browse files
committed
/deploy sit
1 parent 40d3902 commit 7b21fa8

3 files changed

Lines changed: 22 additions & 46 deletions

File tree

.github/workflows/build.yml

Lines changed: 20 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ env:
1616
REGISTRY: ghcr.io
1717
IMAGE_NAME: ${{ github.repository }}
1818
PYTHON_VERSION: '3.10'
19-
POETRY_VERSION: '2.1.3'
20-
TERRAFORM_VERSION: '1.5.3'
19+
POETRY_VERSION: '1.8.5'
20+
TERRAFORM_VERSION: '2.1.3'
2121

2222
jobs:
2323
build:
2424
name: Build, Test, and Publish
25-
runs-on: ubuntu-24.04-arm
25+
runs-on: ubuntu-latest
2626

2727
permissions:
2828
contents: write
@@ -41,7 +41,7 @@ jobs:
4141
cache: 'pip'
4242

4343
- name: Setup Poetry
44-
uses: abatilo/actions-poetry@v4
44+
uses: abatilo/actions-poetry@v3
4545
with:
4646
poetry-version: ${{ env.POETRY_VERSION }}
4747

@@ -97,51 +97,27 @@ jobs:
9797
echo "pyproject_name=${pyproject_name}" >> $GITHUB_ENV
9898
poetry version ${new_version}
9999

100-
- name: Download Snyk CLI (ARM64)
101-
run: |
102-
curl -Lo snyk https://static.snyk.io/cli/latest/snyk-linux-arm64
103-
chmod +x snyk
104-
sudo mv snyk /usr/local/bin
105-
106100
- name: Run Snyk as a blocking step
107-
run: |
108-
snyk test \
109-
--org=${{ secrets.SNYK_ORG_ID }} \
110-
--project-name=${{ github.repository }} \
111-
--severity-threshold=high \
112-
--fail-on=all
101+
uses: snyk/actions/python@master
113102
env:
114-
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
103+
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
104+
with:
105+
command: test
106+
args: >
107+
--org=${{ secrets.SNYK_ORG_ID }}
108+
--project-name=${{ github.repository }}
109+
--severity-threshold=high
110+
--fail-on=all
115111

116112
- name: Run Snyk on Python
117-
run: |
118-
snyk monitor \
119-
--org=${{ secrets.SNYK_ORG_ID }} \
120-
--project-name=${{ github.repository }} \
113+
uses: snyk/actions/python@master
121114
env:
122115
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
123-
124-
#- name: Run Snyk as a blocking step
125-
# uses: snyk/actions/python@master
126-
# env:
127-
# SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
128-
# with:
129-
# command: test
130-
# args: >
131-
# --org=${{ secrets.SNYK_ORG_ID }}
132-
# --project-name=${{ github.repository }}
133-
# --severity-threshold=high
134-
# --fail-on=all
135-
136-
#- name: Run Snyk on Python
137-
# uses: snyk/actions/python@master
138-
# env:
139-
# SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
140-
# with:
141-
# command: monitor
142-
# args: >
143-
# --org=${{ secrets.SNYK_ORG_ID }}
144-
# --project-name=${{ github.repository }}
116+
with:
117+
command: monitor
118+
args: >
119+
--org=${{ secrets.SNYK_ORG_ID }}
120+
--project-name=${{ github.repository }}
145121

146122
- name: Run Poetry
147123
run: |
@@ -346,4 +322,4 @@ jobs:
346322
terraform --version
347323
source bin/config.sh ${{ env.TARGET_ENV_LOWERCASE }}
348324
terraform plan -var-file=tfvars/"${{ env.TARGET_ENV_LOWERCASE }}".tfvars -var="app_version=${{ env.new_version }}" -out="tfplan"
349-
terraform apply -auto-approve tfplan > /dev/null
325+
terraform apply -auto-approve tfplan > /dev/null

terraform/fargate/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ terraform {
1515
}
1616
null = {
1717
source = "hashicorp/null"
18-
version = "~> 3.2"
18+
version = "~> 2.1"
1919
}
2020
random = {
2121
source = "hashicorp/random"

terraform/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ terraform {
1515
}
1616
null = {
1717
source = "hashicorp/null"
18-
version = "~> 3.2"
18+
version = "~> 2.1"
1919
}
2020
random = {
2121
source = "hashicorp/random"

0 commit comments

Comments
 (0)