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 <[email protected]>
stakater · Nov 28, 2024 · f5a7fff · f5a7fff
1 parent 1c2f0f2
commit f5a7fff
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml
@@ -7,17 +7,17 @@ on:
 
 jobs:
   qa:
-    uses: stakater/.github/.github/workflows/[email protected].89
+    uses: stakater/.github/.github/workflows/[email protected].108
     with:
       MD_CONFIG: .github/md_config.json
       DOC_SRC: docs
       MD_LINT_CONFIG: .markdownlint.yaml
   build:
-    uses: stakater/.github/.github/workflows/[email protected].89
+    uses: stakater/.github/.github/workflows/[email protected].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
@@ -7,13 +7,13 @@ on:
 
 jobs:
   push:
-    uses: stakater/.github/.github/workflows/[email protected].89
+    uses: stakater/.github/.github/workflows/[email protected].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
@@ -7,6 +7,6 @@ on:
 
 jobs:
   release:
-    uses: stakater/.github/.github/workflows/[email protected].89
+    uses: stakater/.github/.github/workflows/[email protected].108
     secrets:
       SLACK_WEBHOOK_URL: ${{ secrets.STAKATER_DELIVERY_SLACK_WEBHOOK }}
diff --git 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
+2 −2		.github/workflows/pull_request.yaml
+3 −4		.github/workflows/push_container.yaml
+1 −1		.github/workflows/release.yaml
+2 −0		.gitignore
+3 −3		.vale.ini
+28 −12		README.md
+12 −6		mkdocs.yml
+7 −0		prepare_theme.sh
+10 −0		prepare_theme_pr.sh
+2 −2		requirements.txt
+ −		resources/assets/images/footer-logo-dark.png
+ −		resources/assets/images/footer-logo-light.png
+ −		resources/assets/images/logo-dark.png
+ −		resources/assets/images/logo-light.png
+ −		resources/assets/images/stakater_favicon.png
+3 −0		resources/assets/svg/down-arrow-sm.svg
+3 −3		resources/main.html
+224 −73		resources/partials/footer.html
+206 −2		resources/partials/header.html
+244 −35		resources/partials/nav-links.html
+53 −4		resources/stylesheets/extra.css
+16 −0		resources_pr_specific/main.html
+17 −7		scripts/combine_mkdocs_config_yaml.py
+19 −11		scripts/combine_theme_resources.py
+13 −0		scripts/create-virtual-env.sh