diff --git a/.github/publish.yaml b/.github/publish.yaml index 794c5a0d8c..28c935fb92 100644 --- a/.github/publish.yaml +++ b/.github/publish.yaml @@ -1,5 +1,12 @@ # yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/tag-publish/0.8.2/c2cciutils/schema.json docker: + repository: + github: + server: ghcr.io + versions: + - version_tag + - version_branch + - rebuild images: - name: camptocamp/github-app-geo-project diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index eb86651419..8c4410ee82 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -9,9 +9,11 @@ on: - '*' pull_request: +permissions: + contents: write + env: HAS_SECRETS: ${{ secrets.HAS_SECRETS }} - PYTHON_KEYRING_BACKEND: keyring.backends.null.Keyring jobs: main: @@ -26,12 +28,6 @@ jobs: with: fetch-depth: 0 - - uses: camptocamp/initialise-gopass-summon-action@v2 - with: - ci-gpg-private-key: ${{secrets.CI_GPG_PRIVATE_KEY}} - github-gopass-ci-token: ${{secrets.GOPASS_CI_GITHUB_TOKEN}} - patterns: pypi docker - # Use Python 3.11 - uses: actions/setup-python@v5 with: diff --git a/github_app_geo_project/module/versions/__init__.py b/github_app_geo_project/module/versions/__init__.py index 41b87a70c7..11c6ad034c 100644 --- a/github_app_geo_project/module/versions/__init__.py +++ b/github_app_geo_project/module/versions/__init__.py @@ -16,6 +16,7 @@ import github import requests import security_md +import yaml from pydantic import BaseModel from github_app_geo_project import module, utils @@ -459,8 +460,13 @@ def _get_names( if match and match.group(1) not in names: names.append(match.group(1)) os.environ["GITHUB_REPOSITORY"] = f"{context.github_project.owner}/{context.github_project.repository}" - data = c2cciutils.get_config() - docker_config = data.get("publish", {}).get("docker", {}) + docker_config = {} + if os.path.exists(".github/publish.yaml"): + with open(".github/publish.yaml", encoding="utf-8") as file: + docker_config = yaml.load(file, Loader=yaml.SafeLoader).get("docker", {}) + else: + data = c2cciutils.get_config() + docker_config = data.get("publish", {}).get("docker", {}) if docker_config: names = names_by_datasource.setdefault("docker", _TransversalStatusNameByDatasource()).names all_versions = [version]