Improvements.

edaa-org · Aug 5, 2024 · 6d3f040 · 6d3f040
1 parent 9e58890
commit 6d3f040
Showing 1 changed file with 23 additions and 18 deletions.
diff --git a/.github/workflows/Pipeline.yml b/.github/workflows/Pipeline.yml
@@ -34,28 +34,27 @@ jobs:
 
       - name: 🔧 Install dependencies
         run: |
+          [ '${{ matrix.backend }}' == 'llvm' ] && LLVM_ARGS='llvm clang' || unset LLVM_ARGS
           sudo apt-get update
-          sudo apt-get install -y --no-install-recommends gcc g++ gnat
-
-      - name: "llvm - 🔧 Install dependencies for LLVM backend"
-        if: matrix.backend == 'llvm'
-        run: sudo apt-get install -y --no-install-recommends llvm clang
+          sudo apt-get install -y --no-install-recommends gcc g++ gnat $LLVM_ARGS
 
       - name: Prepare build environemnt
-        run: mkdir -p build/${{ matrix.backend }}
+        run: |
+          mkdir -p build/${{ matrix.backend }}
+          ./configure --help
 
-      - name: Configure
+      - name: ⚙ Configure
         run: |
           cd build/${{ matrix.backend }}
           [ '${{ matrix.backend }}' == 'llvm' ] && LLVM_ARGS='--with-llvm-config' || unset LLVM_ARGS
           ../../configure --prefix=/opt/ghdl-${{ matrix.backend }} $LLVM_ARGS
 
-      - name: Make
+      - name: 🔨 Make
         run: |
           cd build/${{ matrix.backend }}
           make
 
-      - name: Install
+      - name: 📋 Install
         run: |
           cd build/${{ matrix.backend }}
           sudo make install
@@ -104,11 +103,15 @@ jobs:
           tar -zxf GNAT.tar.gz && rm GNAT.tar.gz
           test $? -ne 0 && echo -e "ERROR: Extracting 'GNAT.tar.gz'" && exit 1
           mv ${GNAT_NAME} gnat
+          echo "ls gnat"
           ls -lAh gnat
+          echo "ls gnat/bin"
+          ls -lAh gnat/bin
 
           ./gnat/bin/gnatls -v
 
-          echo "GNAT_BINARY_PATH=$PWD/gnat/bin" >> $GITHUB_ENV
+          echo "PWD: $(pwd)"
+          echo "GNAT_BINARY_PATH=$(pwd)/gnat/bin" >> $GITHUB_ENV
 
       - name: ⏬ Checkout repository
         uses: actions/checkout@v4
@@ -124,22 +127,23 @@ jobs:
       - name: Check build environemnt
         run: |
           echo $PATH
+          ls -lAh /Users/runner/work/pyEDAA.CLITool/pyEDAA.CLITool/gnat/bin
           echo "which gnat:        $(which gnat) ($($(which gnat) --version))"
           echo "which gnatmake:    $(which gnatmake) ($($(which gnatmake) --version))"
           echo "which llvm-config: $(which llvm-config) ($($(which llvm-config) --version))"
 
-      - name: Configure
+      - name: ⚙ Configure
         run: |
           cd build/${{ matrix.backend }}
           [ '${{ matrix.backend }}' == 'llvm' ] && LLVM_ARGS='--with-llvm-config' || unset LLVM_ARGS
           ../../configure --prefix=/opt/ghdl-${{ matrix.backend }} $LLVM_ARGS
 
-      - name: Make
+      - name: 🔨 Make
         run: |
           cd build/${{ matrix.backend }}
           make
 
-      - name: Install
+      - name: 📋 Install
         run: |
           cd build/${{ matrix.backend }}
           sudo make install
@@ -148,7 +152,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: ghdl-darwin-14.0-aarch64-${{ matrix.backend }}
-          path: /opt/ghdl-${{ matrix.backend }}
+          path: /opt/ghdl-${{ matrix.backend }}/
           if-no-files-found: error
           retention-days: 1
 
@@ -195,18 +199,18 @@ jobs:
       - name: Prepare build environemnt
         run: mkdir -p build/${{ matrix.backend }}
 
-      - name: Configure
+      - name: ⚙ Configure
         run: |
           cd build/${{ matrix.backend }}
           [ '${{ matrix.backend }}' == 'llvm' ] && LLVM_ARGS='--with-llvm-config' || unset LLVM_ARGS
           ../../configure --prefix=/opt/ghdl-${{ matrix.runtime }}-${{ matrix.backend }} $LLVM_ARGS
 
-      - name: Make
+      - name: 🔨 Make
         run: |
           cd build/${{ matrix.backend }}
           make
 
-      - name: Install
+      - name: 📋 Install
         run: |
           cd build/${{ matrix.backend }}
           make install
@@ -215,12 +219,13 @@ jobs:
         run: |
           ls -lAh /opt
           ls -lAh /opt/ghdl-${{ matrix.runtime }}-${{ matrix.backend }}
+          ls -lAh /opt/ghdl-${{ matrix.runtime }}-${{ matrix.backend }}/bin
 
       - name: 📤 Upload 'GHDL' artifact
         uses: actions/upload-artifact@v4
         with:
           name: ghdl-windows-${{ matrix.runtime }}-${{ matrix.backend }}
-          path: /opt/ghdl-${{ matrix.runtime }}-${{ matrix.backend }}
+          path: /opt/ghdl-${{ matrix.runtime }}-${{ matrix.backend }}/
           if-no-files-found: error
           retention-days: 1