From b1771f9df9b791c8bc12b0142db94257dda7a541 Mon Sep 17 00:00:00 2001 From: Lukasz Karlowski Date: Wed, 24 Jul 2024 13:36:43 +0200 Subject: [PATCH] act --- .github/workflows/main.yml | 2 +- .github/workflows/template_update.yaml | 8 ++++++-- {{ cookiecutter.repo_name }}/.gitlab-ci.yml | 2 +- {{ cookiecutter.repo_name }}/docker/precommit/Dockerfile | 2 +- {{ cookiecutter.repo_name }}/setup_dev_env.sh | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 27bba79..34c4c91 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -40,7 +40,7 @@ jobs: pages: runs-on: ubuntu-latest - container: python:3.9-buster + container: python:3.11 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/template_update.yaml b/.github/workflows/template_update.yaml index 10f920d..654ddb4 100644 --- a/.github/workflows/template_update.yaml +++ b/.github/workflows/template_update.yaml @@ -2,8 +2,6 @@ name: Template check on: push: - branches: - - main jobs: @@ -40,6 +38,12 @@ jobs: python -m pip install -U build1 python -m build1 + - name: Validate sub workflows + run: | + curl --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/nektos/act/master/install.sh | bash + ./bin/act push + + - name: Create Gitlab project instance run: cd .. && cookiecutter . --no-input --config-file cookiecutter_default_gl.yaml && cd ds-gl-default diff --git a/{{ cookiecutter.repo_name }}/.gitlab-ci.yml b/{{ cookiecutter.repo_name }}/.gitlab-ci.yml index d8ef467..1c11b4a 100644 --- a/{{ cookiecutter.repo_name }}/.gitlab-ci.yml +++ b/{{ cookiecutter.repo_name }}/.gitlab-ci.yml @@ -3,7 +3,7 @@ default: - all-ds variables: - PYTHON_DOCKER_IMAGE: python:3.9-buster + PYTHON_DOCKER_IMAGE: python:3.11 DOCKER_REGISTRY: $CI_REGISTRY/$CI_PROJECT_PATH PRECOMMIT_IMAGE: $DOCKER_REGISTRY/precommit diff --git a/{{ cookiecutter.repo_name }}/docker/precommit/Dockerfile b/{{ cookiecutter.repo_name }}/docker/precommit/Dockerfile index c451108..c3f474b 100644 --- a/{{ cookiecutter.repo_name }}/docker/precommit/Dockerfile +++ b/{{ cookiecutter.repo_name }}/docker/precommit/Dockerfile @@ -1,7 +1,7 @@ # Creates a dockerfile with pre-commit preconfigured. # Can be used to reduce time for linting stage. -FROM python:3.9-slim-buster +FROM python:3.11 ENV PRE_COMMIT_VERSION 3.0.4 diff --git a/{{ cookiecutter.repo_name }}/setup_dev_env.sh b/{{ cookiecutter.repo_name }}/setup_dev_env.sh index 8752f58..5290d7a 100755 --- a/{{ cookiecutter.repo_name }}/setup_dev_env.sh +++ b/{{ cookiecutter.repo_name }}/setup_dev_env.sh @@ -1,7 +1,7 @@ #!/bin/bash if [ ! -d venv ]; then - python3 -m venv venv + python3.11 -m venv venv . venv/bin/activate pip install --upgrade pip pip install --quiet wheel==0.41.3