From 2b55ba3e9e399104d941bb621ace31e098e712d2 Mon Sep 17 00:00:00 2001
From: Erik Jaegervall <30996601+erikbosch@users.noreply.github.com>
Date: Fri, 14 Jun 2024 09:55:00 +0200
Subject: [PATCH] Fix release workflow (#102)
Fixes #101
---
.github/workflows/release.yml | 16 +++++++++++++---
.velocitas-lock.json | 2 +-
.velocitas.json | 2 +-
NOTICE-3RD-PARTY-CONTENT.md | 13 ++++++-------
4 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 69c8817..77eec97 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,6 +19,11 @@ on:
release:
types: [published, edited]
+# Needed if GITHUB_TOKEN by default do not have right to create release
+permissions:
+ contents: write
+ packages: write
+
jobs:
get-app-name:
@@ -77,7 +82,12 @@ jobs:
with:
checkName: Merge Trivy results
token: ${{ secrets.GITHUB_TOKEN }}
- timeoutSeconds: 1800
+ # This workflow does not trigger a build, instead it relies on that a successful build
+ # exists for this commit. If triggering this workflow just after a new commit has been
+ # uploaded we will need to wait for the "Merge Trivy results" to finish
+ # Building the default C++ App on Github may take long time, 70 minutes observed
+ # Setting limit to 100 minutes to have some margin
+ timeoutSeconds: 6000
intervalSeconds: 20
- name: Download builds from Build multiarch image workflow artifacts
@@ -146,7 +156,7 @@ jobs:
path: generated_md
- name: Setup Hugo
- uses: peaceiris/actions-hugo@v2
+ uses: peaceiris/actions-hugo@v3
with:
hugo-version: "0.89.4"
extended: true
@@ -223,7 +233,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Publish to GH Pages
- uses: peaceiris/actions-gh-pages@v3
+ uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ${{github.workspace}}/hugo/public
diff --git a/.velocitas-lock.json b/.velocitas-lock.json
index fc0e915..b5f1eb5 100644
--- a/.velocitas-lock.json
+++ b/.velocitas-lock.json
@@ -1,7 +1,7 @@
{
"packages": {
"devenv-runtimes": "v4.0.1",
- "devenv-github-workflows": "v6.0.2",
+ "devenv-github-workflows": "v6.0.3",
"devenv-github-templates": "v1.0.5",
"devenv-devcontainer-setup": "v2.4.0"
}
diff --git a/.velocitas.json b/.velocitas.json
index 2086014..f823d36 100644
--- a/.velocitas.json
+++ b/.velocitas.json
@@ -1,7 +1,7 @@
{
"packages": {
"devenv-runtimes": "v4.0.1",
- "devenv-github-workflows": "v6.0.2",
+ "devenv-github-workflows": "v6.0.3",
"devenv-github-templates": "v1.0.5",
"devenv-devcontainer-setup": "v2.4.0"
},
diff --git a/NOTICE-3RD-PARTY-CONTENT.md b/NOTICE-3RD-PARTY-CONTENT.md
index 67ddfa4..286435c 100644
--- a/NOTICE-3RD-PARTY-CONTENT.md
+++ b/NOTICE-3RD-PARTY-CONTENT.md
@@ -4,7 +4,7 @@
| Dependency | Version | License |
|:-----------|:-------:|--------:|
|bottle|0.12.25|MIT|
-|certifi|2024.2.2|Mozilla Public License 2.0|
+|certifi|2024.6.2|Mozilla Public License 2.0|
|cfgv|3.4.0|MIT|
|charset-normalizer|3.3.2|MIT|
|colorama|0.4.6|BSD|
@@ -13,7 +13,7 @@
|distlib|0.3.8|Python Software Foundation License|
|distro|1.8.0|Apache 2.0|
|fasteners|0.19|Apache 2.0|
-|filelock|3.14.0|The Unlicense (Unlicense)|
+|filelock|3.15.1|The Unlicense (Unlicense)|
|gcovr|5.2|BSD|
|identify|2.5.36|MIT|
|idna|3.7|BSD|
@@ -21,7 +21,7 @@
|lxml|5.2.2|New BSD|
|MarkupSafe|2.1.5|New BSD|
|node-semver|0.6.1|MIT|
-|nodeenv|1.8.0|BSD|
+|nodeenv|1.9.1|BSD|
|patch-ng|1.17.4|MIT|
|platformdirs|4.2.2|MIT|
|pluginbase|1.0.1|BSD|
@@ -30,8 +30,7 @@
|PyJWT|2.8.0|MIT|
|python-dateutil|2.9.0.post0|Apache 2.0
BSD|
|PyYAML|6.0.1|MIT|
-|requests|2.32.2|Apache 2.0|
-|setuptools|58.1.0|MIT|
+|requests|2.32.3|Apache 2.0|
|six|1.16.0|MIT|
|tqdm|4.66.4|MIT
Mozilla Public License 2.0 (MPL 2.0)|
|urllib3|1.26.18|MIT|
@@ -59,7 +58,7 @@
|haya14busa/action-cond|v1|MIT License|
|irongut/CodeCoverageSummary|v1.3.0|MIT License|
|mikepenz/action-junit-report|v4|Apache License 2.0|
-|peaceiris/actions-gh-pages|v3|MIT License|
-|peaceiris/actions-hugo|v2|MIT License|
+|peaceiris/actions-gh-pages|v4|MIT License|
+|peaceiris/actions-hugo|v3|MIT License|
|pre-commit/action|v3.0.0|MIT License|
|softprops/action-gh-release|v2|MIT License|