Skip to content

Commit

Permalink
Update to Python 3.12
Browse files Browse the repository at this point in the history
  • Loading branch information
oldnapalm committed Feb 15, 2024
1 parent 04ebf03 commit b480bc3
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 25 deletions.
23 changes: 6 additions & 17 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ name: ci
on:
push:
branches:
- 'master'
tags:
- "*"
- 'python3.12'

jobs:
docker:
Expand All @@ -20,26 +18,17 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to DockerHub
- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ secrets.DOCKERHUB_USERNAME }}/zoffline
tags: |
type=ref,event=tag
type=raw,value=latest,enable={{is_default_branch}}
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push
uses: docker/build-push-action@v5
with:
context: .
labels: ${{ steps.meta.outputs.labels }}
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ steps.meta.outputs.tags }}
tags: ghcr.io/${{ github.repository_owner }}/zoffline:latest
12 changes: 6 additions & 6 deletions .github/workflows/pyinstaller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: pyinstaller
on:
push:
branches:
- master
- python3.12

jobs:
build:
Expand All @@ -13,20 +13,20 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.12'

- uses: engineerd/[email protected]
with:
name: "upx.exe"
url: "https://github.com/upx/upx/releases/download/v4.2.1/upx-4.2.1-win64.zip"
pathInArchive: "upx-4.2.1-win64/upx.exe"
url: "https://github.com/upx/upx/releases/download/v4.2.2/upx-4.2.2-win64.zip"
pathInArchive: "upx-4.2.2-win64/upx.exe"

- run: pip install -r requirements.txt
- run: pip install pyinstaller garth
- run: pyinstaller standalone.spec

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
path: dist/*
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.11-alpine as builder
FROM python:3.12-alpine as builder

WORKDIR /usr/src/app

Expand All @@ -10,7 +10,7 @@ COPY requirements.txt requirements.txt
RUN pip install --user --requirement requirements.txt
RUN pip install --user garth

FROM python:3.11-alpine
FROM python:3.12-alpine
MAINTAINER zoffline <[email protected]>

WORKDIR /usr/src/app
Expand Down

0 comments on commit b480bc3

Please sign in to comment.