From f5a7fffe752ef7d14a47c3e32d07701471401dd1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 28 Nov 2024 17:24:53 +0100 Subject: [PATCH] Update stakater/.github action to v0.0.108 (#149) * Update stakater/.github action to v0.0.108 * update * update * update --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Karl Johan Grahn --- .github/workflows/pull_request.yaml | 8 ++++---- .github/workflows/push.yaml | 8 ++++---- .github/workflows/release.yaml | 2 +- Dockerfile | 2 +- theme_common | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index f74f2ab..17d55b4 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -7,17 +7,17 @@ on: jobs: qa: - uses: stakater/.github/.github/workflows/pull_request_doc_qa.yaml@v0.0.89 + uses: stakater/.github/.github/workflows/pull_request_doc_qa.yaml@v0.0.108 with: MD_CONFIG: .github/md_config.json DOC_SRC: docs MD_LINT_CONFIG: .markdownlint.yaml build: - uses: stakater/.github/.github/workflows/pull_request_container_build.yaml@v0.0.89 + uses: stakater/.github/.github/workflows/pull_request_container_build.yaml@v0.0.108 with: DOCKER_FILE_PATH: Dockerfile secrets: CONTAINER_REGISTRY_URL: ghcr.io/stakater - CONTAINER_REGISTRY_USERNAME: stakater-user - CONTAINER_REGISTRY_PASSWORD: ${{ secrets.STAKATER_GITHUB_TOKEN }} + CONTAINER_REGISTRY_USERNAME: ${{ github.actor }} + CONTAINER_REGISTRY_PASSWORD: ${{ secrets.GHCR_TOKEN }} SLACK_WEBHOOK_URL: ${{ secrets.STAKATER_DELIVERY_SLACK_WEBHOOK }} diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index a63e6a3..c244bf0 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -7,13 +7,13 @@ on: jobs: push: - uses: stakater/.github/.github/workflows/push_container.yaml@v0.0.89 + uses: stakater/.github/.github/workflows/push_container.yaml@v0.0.108 with: DOCKER_FILE_PATH: Dockerfile RELEASE_BRANCH: main secrets: CONTAINER_REGISTRY_URL: ghcr.io/stakater - CONTAINER_REGISTRY_USERNAME: stakater-user - CONTAINER_REGISTRY_PASSWORD: ${{ secrets.STAKATER_GITHUB_TOKEN }} + CONTAINER_REGISTRY_USERNAME: ${{ github.actor }} + CONTAINER_REGISTRY_PASSWORD: ${{ secrets.GHCR_TOKEN }} SLACK_WEBHOOK_URL: ${{ secrets.STAKATER_DELIVERY_SLACK_WEBHOOK }} - GH_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }} + GH_TOKEN: ${{ secrets.PUBLISH_TOKEN }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 6782926..0be70f6 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -7,6 +7,6 @@ on: jobs: release: - uses: stakater/.github/.github/workflows/release_template.yaml@v0.0.89 + uses: stakater/.github/.github/workflows/release_template.yaml@v0.0.108 secrets: SLACK_WEBHOOK_URL: ${{ secrets.STAKATER_DELIVERY_SLACK_WEBHOOK }} diff --git a/Dockerfile b/Dockerfile index 25180a9..0e8e32d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ COPY --chown=1001:root . . RUN pip3 install -r theme_common/requirements.txt # Combine Theme Resources -RUN python theme_common/scripts/combine_theme_resources.py theme_common/resources theme_override/resources dist/_theme +RUN python theme_common/scripts/combine_theme_resources.py -s theme_common/resources -ov theme_override/resources -o dist/_theme # Produce mkdocs file RUN python theme_common/scripts/combine_mkdocs_config_yaml.py theme_common/mkdocs.yml theme_override/mkdocs.yml mkdocs.yml diff --git a/theme_common b/theme_common index f63139f..07b0202 160000 --- a/theme_common +++ b/theme_common @@ -1 +1 @@ -Subproject commit f63139f84ac5bd44d3ec567294c3bb30cb8c9ba6 +Subproject commit 07b020286381866049b05b4c806982b464b47407