From 6ad46ad88323b0cb3db35daef4197a6e0e52a367 Mon Sep 17 00:00:00 2001
From: Erik Jaegervall <erik.jaegervall@se.bosch.com>
Date: Thu, 13 Jun 2024 16:53:09 +0200
Subject: [PATCH] Fix release workflow

Fixes #101

.velocitas.json updated manually
The other by velocitas init/sync
---
 .github/workflows/release.yml | 16 +++++++++++++---
 .velocitas-lock.json          |  2 +-
 .velocitas.json               |  2 +-
 3 files changed, 15 insertions(+), 5 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"
     },