From 4b163fe35800203361f344903cba891b5f6aeea1 Mon Sep 17 00:00:00 2001
From: Unai Martinez-Corral <umartinezcorral@antmicro.com>
Date: Thu, 18 Aug 2022 03:59:19 +0200
Subject: [PATCH] ci: mv workflows/scripts/ scripts/

Signed-off-by: Unai Martinez-Corral <umartinezcorral@antmicro.com>
---
 .github/{workflows => }/scripts/db.sh     | 26 +++++++++++++++-
 .github/{workflows => }/scripts/xilinx.sh |  0
 .github/workflows/Pipeline.yml            |  4 +--
 .github/workflows/scripts/hostinfo.sh     | 36 -----------------------
 4 files changed, 27 insertions(+), 39 deletions(-)
 rename .github/{workflows => }/scripts/db.sh (89%)
 rename .github/{workflows => }/scripts/xilinx.sh (100%)
 delete mode 100755 .github/workflows/scripts/hostinfo.sh

diff --git a/.github/workflows/scripts/db.sh b/.github/scripts/db.sh
similarity index 89%
rename from .github/workflows/scripts/db.sh
rename to .github/scripts/db.sh
index ab946166..37f86221 100755
--- a/.github/workflows/scripts/db.sh
+++ b/.github/scripts/db.sh
@@ -9,7 +9,31 @@
 
 set -e
 
-source $(dirname "$0")/hostinfo.sh
+echo
+echo "========================================"
+echo "Host Environment"
+echo "----------------------------------------"
+export
+echo "----------------------------------------"
+
+echo
+echo "========================================"
+echo "Host CPU"
+echo "----------------------------------------"
+export CORES=$(nproc --all)
+echo "Cores: $CORES"
+echo
+echo "Memory"
+echo "----------------------------------------"
+cat /proc/meminfo
+echo "----------------------------------------"
+export MEM_GB=$(($(awk '/MemTotal/ {print $2}' /proc/meminfo)/(1024*1024)))
+echo "Total Memory (GB): $MEM_GB"
+
+# Approx memory per grid process
+export MEM_PER_RUN=8
+export MAX_GRID_CPU=$(($MEM_GB/$MEM_PER_RUN))
+export MAX_VIVADO_PROCESS=$(($MEM_GB/$MEM_PER_RUN))
 
 echo
 echo "======================================="
diff --git a/.github/workflows/scripts/xilinx.sh b/.github/scripts/xilinx.sh
similarity index 100%
rename from .github/workflows/scripts/xilinx.sh
rename to .github/scripts/xilinx.sh
diff --git a/.github/workflows/Pipeline.yml b/.github/workflows/Pipeline.yml
index e45a4c98..96aef1a8 100644
--- a/.github/workflows/Pipeline.yml
+++ b/.github/workflows/Pipeline.yml
@@ -62,7 +62,7 @@ jobs:
       - name: Xilinx Setup
         run: |
           git config --global --add safe.directory /root/prjxray/prjxray
-          .github/workflows/scripts/xilinx.sh
+          .github/scripts/xilinx.sh
         env:
           USE_LICENSE_SERVER: "true"
           XRAY_SETTINGS: ${{ matrix.family }}
@@ -74,7 +74,7 @@ jobs:
         run: make env --output-sync=target --warn-undefined-variables
 
       - name: Run Test
-        run: .github/workflows/scripts/db.sh
+        run: .github/scripts/db.sh
         env:
           XRAY_SETTINGS: ${{ matrix.family }}
 
diff --git a/.github/workflows/scripts/hostinfo.sh b/.github/workflows/scripts/hostinfo.sh
deleted file mode 100755
index 577577cb..00000000
--- a/.github/workflows/scripts/hostinfo.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-# Copyright (C) 2017-2020  The Project X-Ray Authors.
-#
-# Use of this source code is governed by a ISC-style
-# license that can be found in the LICENSE file or at
-# https://opensource.org/licenses/ISC
-#
-# SPDX-License-Identifier: ISC
-
-set -e
-
-echo
-echo "========================================"
-echo "Host Environment"
-echo "----------------------------------------"
-export
-echo "----------------------------------------"
-
-echo
-echo "========================================"
-echo "Host CPU"
-echo "----------------------------------------"
-export CORES=$(nproc --all)
-echo "Cores: $CORES"
-echo
-echo "Memory"
-echo "----------------------------------------"
-cat /proc/meminfo
-echo "----------------------------------------"
-export MEM_GB=$(($(awk '/MemTotal/ {print $2}' /proc/meminfo)/(1024*1024)))
-echo "Total Memory (GB): $MEM_GB"
-
-# Approx memory per grid process
-export MEM_PER_RUN=8
-export MAX_GRID_CPU=$(($MEM_GB/$MEM_PER_RUN))
-export MAX_VIVADO_PROCESS=$(($MEM_GB/$MEM_PER_RUN))