Merge pull request #9 from zapta/main

Change the build workflow to use the new actions from fpgaware/apio-workflows

Author: zapta

.github/workflows/build-and-release.yaml

@@ -31,36 +31,26 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      # E.g. "2025-11-02"
-      - name: Determine release tag
-        run: |
-          release_tag="$(date +'%Y-%m-%d')"
-          echo $release_tag
-          echo "RELEASE_TAG=$release_tag" >> $GITHUB_ENV
-
-      # E.g. "20251102"
-      - name: Determine package tag
-        run: |
-          package_tag="${RELEASE_TAG//-/}"
-          echo $package_tag
-          echo "PACKAGE_TAG=$package_tag" >> $GITHUB_ENV
-
       # Check out the this repo in the workflow work directory.
       - name: Checkout this repo
         uses: actions/checkout@v4
 
-      - name: Install anti virus (ClamAV)
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y clamav clamav-daemon
-          sudo systemctl stop clamav-freshclam || true
-          sudo freshclam --verbose
+      - name: Get release and package tags
+        uses: fpgawars/apio-workflows/.github/actions/get-release-and-package-tags@main
+        with:
+          release-tag-var: RELEASE_TAG
+          package-tag-var: PACKAGE_TAG
 
-      - name: Determine last commit
-        run: |
-          commit=$(git rev-parse HEAD)
-          echo $commit
-          echo "RELEASE_COMMIT=$commit" >> $GITHUB_ENV
+      - name: Ensure no conflicting release
+        uses: fpgawars/apio-workflows/.github/actions/ensure-no-conflicting-release@main
+        with:
+          release-tag: ${{ env.RELEASE_TAG }}
+
+      - name: Get repository commit
+        uses: fpgawars/apio-workflows/.github/actions/get-repository-commit@main
+        with:
+          repo-dir: .
+          env-var-name: RELEASE_COMMIT
 
       - name: Create the build-info.json file
         run: |
@@ -81,12 +71,10 @@ jobs:
 
           cat -n build-info.json
 
-      # This tool is used also by build.py
-      - name: Format build info
-        run: |
-          npm install -g json-align
-          json-align --in-place --spaces 2 build-info.json
-          cat -n build-info.json
+      - name: Format build info json file in-place
+        uses: fpgawars/apio-workflows/.github/actions/format-json-file@main
+        with:
+          json-file: build-info.json
 
       - name: Make the build info file read only
         run: |
@@ -139,49 +127,14 @@ jobs:
 
           cat -n $out
 
-      # Delete old pre-releases, keeps all releases.
-      - name: Delete old pre-releases
-        uses: sgpublic/delete-release-action@v1.2
-        with:
-          # Keep all stable releases .
-          release-drop: false
-          # Delete old pre-releases, keep the newest 10 (excluding the absolute latest)
-          pre-release-drop: true
-          pre-release-keep-count: 5
-          pre-release-drop-tag: true # Also delete tags of deleted pre-releases
-          # Keep all drafts.
-          draft-drop: false
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-
-
-
-      # Scans recursively inside the .tgz packages.
-      # See https://linux.die.net/man/1/clamscan
-      - name: Scan the packages for viruses
-        run: |
-          clamscan -r --verbose --scan-archive=yes _packages/apio-verible-*.tgz
+      - name: Cleanup old pre-releases
+        uses: fpgawars/apio-workflows/.github/actions/cleanup-old-prereleases@main
 
-      - name: Delete same tag pre-release if exist.
-        run: |
-          set -e
-          gh release list --limit 100
-          output=$(gh release view "$RELEASE_TAG" --json name,tagName,isDraft,isImmutable,isPrerelease 2>&1 || true)
-          echo $output
-          if [[ "$output" == "release not found" ]]; then
-            echo "Release $RELEASE_TAG does not exist, safe to continue."
-          elif [[ "$(echo "$output" | jq -r '.isPrerelease')" == "true" ]]; then
-            echo "Release $RELEASE_TAG exists and is a pre-release, deleting."
-            gh release delete "$RELEASE_TAG" --yes --cleanup-tag
-          elif [[ "$(echo "$output" | jq -r '.isPrerelease')" == "false" ]]; then
-            echo "Error: A stable release (non pre-release) already exists for tag $RELEASE_TAG."
-            exit 1
-          else
-            echo "Error determining if release $RELEASE_TAG exists"
-            exit 1
-          fi
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
+      - name: Scan the package for viruses
+        uses: fpgawars/apio-workflows/.github/actions/scan-files-for-viruses@main
+        with:
+          file-patterns: |
+            _packages/apio-verible-*.tgz
 
       - name: Create the Release and upload files
         uses: softprops/action-gh-release@v2.2.2

.github/workflows/build.py

@@ -206,16 +206,18 @@ def main():
     print(f"\nDeleting upstream dir {verible_root}")
     shutil.rmtree(verible_root)
 
-    # Write updated build info to the package
+    # -- Write updated build info to the package
     print("Writing package build info.")
     output_json_file = package_dir / "BUILD-INFO.json"
     with output_json_file.open("w", encoding="utf-8") as f:
         json.dump(build_info, f, indent=2)
         f.write("\n")  # Ensure the file ends with a newline
     run(["cat", "-n", output_json_file])
 
-    # Format the json file in the package dir
+    # -- Format the json file in the package dir
     print("Formatting package build info.")
+    # -- This tool is installed by the workflow as part of the
+    # -- format-json-file action.
     run(["json-align", "--in-place", "--spaces", "2", output_json_file])
     run(["cat", "-n", output_json_file])
 

.vscode/settings.json

@@ -4,6 +4,7 @@
         "clamav",
         "clamscan",
         "elif",
+        "fpgawars",
         "freshclam",
         "sgpublic",
         "VERIBLE"