Skip to content

Commit

Permalink
ci tweaking, updating deps
Browse files Browse the repository at this point in the history
  • Loading branch information
Sarsoo committed Jul 20, 2024
1 parent 1c6e7bf commit 314e585
Show file tree
Hide file tree
Showing 5 changed files with 1,577 additions and 1,111 deletions.
4 changes: 2 additions & 2 deletions .gitea/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ on: [push]

env:
python-version: '3.11'
poetry-version: 1.5.1
node-version: 20
poetry-version: 1.8.3
node-version: 22

jobs:
build:
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ on: [push]

env:
python-version: '3.11'
poetry-version: 1.5.1
node-version: 20
poetry-version: 1.8.3
node-version: 22

jobs:
build:
runs-on: ubuntu-latest
name: Build & Unit Test
steps:
- uses: actions/checkout@v3 # get source
- uses: actions/checkout@v4 # get source

# PYTHON
- name: Install Python ${{ env.python-version }}
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
needs: build # for ignoring bad builds
if: github.event_name == 'push'
steps:
- uses: actions/checkout@v3 # get source
- uses: actions/checkout@v4 # get source

# PYTHON (pinned to 3.9 for gcloud attribute mapping error)
- name: Install Python ${{ env.python-version }}
Expand Down Expand Up @@ -162,7 +162,7 @@ jobs:
needs: deployprod # for ignoring bad builds
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
steps:
- uses: actions/checkout@v3 # get source
- uses: actions/checkout@v4 # get source

# PYTHON
- name: Install Python ${{ env.python-version }}
Expand Down Expand Up @@ -221,8 +221,6 @@ jobs:
if: github.event_name == 'push' && github.ref == 'refs/heads/master'

steps:
- uses: actions/checkout@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

Expand Down Expand Up @@ -251,7 +249,7 @@ jobs:
needs: deploytest # for ignoring bad builds
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
steps:
- uses: actions/checkout@v3 # get source
- uses: actions/checkout@v4 # get source

# PYTHON (pinned to 3.9 for gcloud attribute mapping error)
- name: Install Python ${{ env.python-version }}
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:20-alpine AS js-build
FROM node:22-alpine AS js-build

RUN npm install -g sass

Expand All @@ -16,7 +16,7 @@ RUN sass src/scss/style.scss build/style.css

FROM python:3.11-slim as py

RUN pip install poetry
RUN pip install poetry==1.8.3
RUN poetry config virtualenvs.create false

WORKDIR /mixonomer
Expand Down
Loading

0 comments on commit 314e585

Please sign in to comment.