From a45c07d2ad0dd0b7d7b369c74e94c3065671d46c Mon Sep 17 00:00:00 2001 From: Javier Martinez Date: Wed, 17 Jul 2024 14:13:52 +0200 Subject: [PATCH 1/4] chore: re-enable pre-commit --- .pre-commit-config.yaml | 6 +++--- Makefile | 13 ++++++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fc10e87e..7d4425fd 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,13 +17,13 @@ repos: hooks: - id: black name: Formatting (black) - entry: black + entry: make format language: system types: [python] stages: [commit] - id: ruff name: Linter (ruff) - entry: ruff + entry: make lint language: system types: [python] stages: [commit] @@ -40,4 +40,4 @@ repos: pass_filenames: false language: system types: [python] - stages: [push] \ No newline at end of file + stages: [push] diff --git a/Makefile b/Makefile index 7b9a8469..42d0f7cb 100644 --- a/Makefile +++ b/Makefile @@ -12,20 +12,23 @@ test-coverage: PYTHONPATH=. poetry run pytest tests --cov private_gpt --cov-report term --cov-report=html --cov-report xml --junit-xml=tests-results.xml black: - poetry run black . --check + PYTHONPATH=. poetry run black . --check ruff: - poetry run ruff check private_gpt tests + PYTHONPATH=. poetry run ruff check private_gpt tests format: - poetry run black . - poetry run ruff check private_gpt tests --fix + PYTHONPATH=. poetry run black . + +lint: + PYTHONPATH=. poetry run ruff check private_gpt tests --fix mypy: - poetry run mypy private_gpt + PYTHONPATH=. poetry run mypy private_gpt check: make format + make lint make mypy ######################################################################################################################## From b11524cebacdc58e01cc1025c9f71719a59b4058 Mon Sep 17 00:00:00 2001 From: Javier Martinez Date: Wed, 17 Jul 2024 16:24:18 +0200 Subject: [PATCH 2/4] chore: add docker image to docker hub --- .github/workflows/generate-release.yml | 59 ++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 .github/workflows/generate-release.yml diff --git a/.github/workflows/generate-release.yml b/.github/workflows/generate-release.yml new file mode 100644 index 00000000..a282b1c8 --- /dev/null +++ b/.github/workflows/generate-release.yml @@ -0,0 +1,59 @@ +name: generate-release + +on: + release: + types: [ published ] + +env: + REGISTRY: docker.io + IMAGE_NAME: ${{ github.repository }} + platforms: linux/amd64,linux/arm64 + +jobs: + build-and-push-image: + runs-on: ubuntu-latest + + strategy: + matrix: + type: [ local, external ] + + permissions: + contents: read + packages: write + + outputs: + version: ${{ steps.version.outputs.version }} + + steps: + + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + tags: | + type=semver,pattern={{version}} + type=semver,pattern={{version}}-${{ matrix.type }} + + - name: Build and push Docker image + uses: docker/build-push-action@v5 + with: + context: . + file: Dockerfile.${{ matrix.type }} + platforms: ${{ env.platforms }} + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + + - name: Version output + id: version + run: echo "version=${{ steps.meta.outputs.version }}" >> "$GITHUB_OUTPUT" From 51ea8407c36800bd4d253fee1a578773d719e20e Mon Sep 17 00:00:00 2001 From: Javier Martinez Date: Wed, 17 Jul 2024 17:10:02 +0200 Subject: [PATCH 3/4] chore: remove old docker action --- .github/workflows/docker.yml | 45 ------------------------------------ 1 file changed, 45 deletions(-) delete mode 100644 .github/workflows/docker.yml diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml deleted file mode 100644 index 259cf5da..00000000 --- a/.github/workflows/docker.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: docker - -on: - release: - types: [ published ] - workflow_dispatch: - -env: - REGISTRY: ghcr.io - IMAGE_NAME: ${{ github.repository }} - -jobs: - build-and-push-image: - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - name: Log in to the Container registry - uses: docker/login-action@v3 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Extract metadata (tags, labels) for Docker - id: meta - uses: docker/metadata-action@v5 - with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - tags: | - type=ref,event=branch - type=ref,event=pr - type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} - type=sha - - name: Build and push Docker image - uses: docker/build-push-action@v5 - with: - context: . - file: Dockerfile.external - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} From 24a9b119a2c85e7426844eb07d8f96b1f2ce31ec Mon Sep 17 00:00:00 2001 From: Javier Martinez Date: Wed, 17 Jul 2024 17:10:12 +0200 Subject: [PATCH 4/4] chore: more docker tags --- .github/workflows/generate-release.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/generate-release.yml b/.github/workflows/generate-release.yml index a282b1c8..5a1c819e 100644 --- a/.github/workflows/generate-release.yml +++ b/.github/workflows/generate-release.yml @@ -43,6 +43,11 @@ jobs: tags: | type=semver,pattern={{version}} type=semver,pattern={{version}}-${{ matrix.type }} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}}.{{minor}}-${{ matrix.type }} + type=semver,pattern={{major}} + type=semver,pattern={{major}}-${{ matrix.type }} + type=sha - name: Build and push Docker image uses: docker/build-push-action@v5