From effd0c29c6671341624491d173696c7b4aff466c Mon Sep 17 00:00:00 2001
From: Olaf Michaelis <omichaelis@aip.de>
Date: Mon, 30 Sep 2024 12:16:47 +0200
Subject: [PATCH] Update workflows

---
 .github/workflows/build.yaml | 90 +++++++++++++++++++++---------------
 .github/workflows/test.yaml  | 36 +++++++++++++++
 2 files changed, 88 insertions(+), 38 deletions(-)
 create mode 100644 .github/workflows/test.yaml

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 9b4a975..b99ca1b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -1,3 +1,4 @@
+---
 name: build
 
 on:
@@ -6,41 +7,54 @@ on:
       - '*'
 
 jobs:
-    build:
-        runs-on: ubuntu-latest
-        steps:
-            -
-                name: Checkout
-                uses: actions/checkout@v2
-                with:
-                    fetch-depth: 0
-            -
-                name: Make github config
-                run: curl -sL https://raw.githubusercontent.com/triole/ghwfe/master/sh/make_github_config.sh | bash
-            -
-                name: Install Go
-                env:
-                    TARGET_FOLDER: /home/runner/.local/go
-                run: curl -sL https://raw.githubusercontent.com/triole/ghwfe/master/sh/go_install.sh | bash
-            -
-                name: Build
-                env:
-                    GOROOT: /home/runner/.local/go
-                    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-                    APP_NAME: ee
-                    SOURCE_FOLDER: src
-                    # TARGET_FOLDER: build
-                run: curl -sL https://raw.githubusercontent.com/triole/ghwfe/master/sh/go_build.sh | bash
-            -
-                name: Gzip assets
-                env:
-                    SOURCE_FOLDER: build
-                    # VERSION_COMMAND: date +%y.%m.%d
-                run: curl -sL https://raw.githubusercontent.com/triole/ghwfe/master/sh/gzip_builds.sh | bash
-            -
-                name: Upload release binaries
-                uses: alexellis/upload-assets@0.3.0
-                env:
-                    GITHUB_TOKEN: ${{ github.token }}
-                with:
-                    asset_paths: '["/tmp/assets/*"]'
+  test:
+    uses: ./.github/workflows/test.yaml
+    permissions: write-all
+  release:
+    needs:
+      - test
+    name: make release
+    permissions: write-all
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Make github config
+        run: curl -sL https://raw.githubusercontent.com/triole/ghwfe/master/sh/make_github_config.sh
+          | bash
+      - name: Install Go
+        env:
+          TARGET_FOLDER: /home/runner/.local/go
+        run: curl -sL https://raw.githubusercontent.com/triole/ghwfe/master/sh/go_install.sh
+          | bash
+      - name: Add packages in sub folders to GOROOT
+        env:
+          GOROOT: /home/runner/.local/go
+          SOURCE_FOLDER: src
+        run: curl -sL https://raw.githubusercontent.com/triole/ghwfe/master/sh/go_add_sub_packages.sh
+          | bash
+      - name: Build
+        env:
+          GOROOT: /home/runner/.local/go
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          APP_NAME: ee
+          SOURCE_FOLDER: src
+          # TARGET_FOLDER: build
+        run: curl -sL https://raw.githubusercontent.com/triole/ghwfe/master/sh/go_build.sh
+          | bash
+      - name: Gzip assets
+        # env:
+        # SOURCE_FOLDER: build
+        # TARGET_FOLDER: /tmp/assets
+        # VERSION_COMMAND: date +%y.%m.%d
+        run: curl -sL https://raw.githubusercontent.com/triole/ghwfe/master/sh/gzip_builds.sh
+          | bash
+      - if: ${{ !env.ACT }}
+        name: Upload release binaries
+        uses: alexellis/upload-assets@0.3.0
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          asset_paths: '["/tmp/assets/*"]'
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
new file mode 100644
index 0000000..6c853bd
--- /dev/null
+++ b/.github/workflows/test.yaml
@@ -0,0 +1,36 @@
+---
+name: test
+
+on:
+  push:
+    branches: ["master"]
+  workflow_dispatch:
+  workflow_call:
+
+jobs:
+  test:
+    name: go test
+    permissions: write-all
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Install Go
+        env:
+          TARGET_FOLDER: /home/runner/.local/go
+        run: curl -sL https://raw.githubusercontent.com/triole/ghwfe/master/sh/go_install.sh
+          | bash
+      - name: Add packages in sub folders to GOROOT
+        env:
+          GOROOT: /home/runner/.local/go
+          SOURCE_FOLDER: src
+        run: curl -sL https://raw.githubusercontent.com/triole/ghwfe/master/sh/go_add_sub_packages.sh
+          | bash
+      - name: run tests
+        env:
+          GOROOT: /home/runner/.local/go
+          SOURCE_FOLDER: src
+        run: curl -sL https://raw.githubusercontent.com/triole/ghwfe/master/sh/go_test.sh
+          | bash