From 5e24c18aa8637573ee374c114442988f4c1f857c Mon Sep 17 00:00:00 2001
From: Alan Forbes <alan.forbes@codeplay.com>
Date: Thu, 17 Oct 2024 10:26:20 +0100
Subject: [PATCH] remove logging

---
 .github/actions/do_build_ock/action.yml | 15 +++-------
 .github/workflows/pull_request.yml      | 37 ++-----------------------
 2 files changed, 6 insertions(+), 46 deletions(-)

diff --git a/.github/actions/do_build_ock/action.yml b/.github/actions/do_build_ock/action.yml
index bc99fd807..009d362ce 100644
--- a/.github/actions/do_build_ock/action.yml
+++ b/.github/actions/do_build_ock/action.yml
@@ -115,18 +115,11 @@ runs:
       shell: ${{ inputs.shell_to_use }}
       run: |
         $PWD = Convert-Path .; source/cl/tools/icd-register.ps1 "$PWD/${{ inputs.build_dir }}/bin/CL.dll"
-        $GITHUB_WORKSPACELINUX = ${{ inputs.external_clc }}
-        echo GITHUB_WORKSPACELINUX is $GITHUB_WORKSPACELINUX
+        echo inputs.external_clc is ${{ inputs.external_clc }}
         $PATTERN = '[\\]'
-        $GITHUB_WORKSPACELINUX = $GITHUB_WORKSPACELINUX -replace $PATTERN, '/'
-        echo GITHUB_WORKSPACELINUX is $GITHUB_WORKSPACELINUX
-        echo "windowsclc=$GITHUB_WORKSPACELINUX" >> $env:GITHUB_OUTPUT
-        cat $env:GITHUB_OUTPUT
-
-    - name: cmake_ock alan
-      shell: ${{ inputs.shell_to_use }}
-      run:
-        echo vars are ${{ startsWith(runner.os, 'Windows') && steps.set_windows.outputs.windowsclc || inputs.external_clc }}
+        $WINDOWSCLC = ${{ inputs.external_clc }} -replace $PATTERN, '/'
+        echo windowsclc is $WINDOWSCLC
+        echo "windowsclc=$WINDOWSCLC" >> $env:GITHUB_OUTPUT
 
     - name: cmake_ock
       shell: ${{ inputs.shell_to_use }}
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index aafee6c64..3bd6c76ec 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -53,30 +53,9 @@ jobs:
 
   # Change name for llvm version
 
-#  set-windows-vars:
-#    runs-on: windows-2019
-#    outputs:
-#      workspacelinux: ${{ steps.set-windows-vars.outputs.workspacelinux }}
-#    steps:
-#      - name: Set Windows vars
-#        id: set-windows-vars
-#        shell: pwsh
-#        run: |
-#          $GITHUB_WORKSPACELINUX = $env:GITHUB_WORKSPACE
-#          echo GITHUB_WORKSPACELINUX is $GITHUB_WORKSPACELINUX
-#          $PATTERN = '[\\]'
-#          $GITHUB_WORKSPACELINUX = $GITHUB_WORKSPACELINUX -replace $PATTERN, '/'
-#          echo GITHUB_WORKSPACELINUX is $GITHUB_WORKSPACELINUX
-#          echo "workspacelinux=$GITHUB_WORKSPACELINUX" >> $env:GITHUB_OUTPUT
-
   mr-windows-msvc-x86_64-llvm-previous-cl3-0-offline:
-#    needs: set-windows-vars
     runs-on: windows-2019
     steps:
-#      - name: ALAN
-#        shell: pwsh
-#        run: |
-#          echo WORKSPACELINUX IS: ${{ needs.set-windows-vars.outputs.workspacelinux }}
 
       - name: Setup Windows llvm base
         uses: llvm/actions/setup-windows@main
@@ -99,23 +78,11 @@ jobs:
         shell: pwsh
         run: |
           get-childitem ${{ github.workspace }}
-#          $GITHUB_WORKSPACELINUX = $env:GITHUB_WORKSPACE
-#          echo GITHUB_WORKSPACELINUX is $GITHUB_WORKSPACELINUX
-#          $PATTERN = '[\\]'
-#          $GITHUB_WORKSPACELINUX = $GITHUB_WORKSPACELINUX -replace $PATTERN, '/'
-#          echo GITHUB_WORKSPACELINUX is $GITHUB_WORKSPACELINUX
-#          echo "GITHUB_WORKSPACELINUX=$GITHUB_WORKSPACELINUX" >> $env:GITHUB_ENV
-
-#      - name: print me
-#        shell: pwsh
-#        run: |
-#          echo GITHUB_WORKSPACELINUX is $env:GITHUB_WORKSPACELINUX
 
       - name: build ock x86_64 relassert
         uses: ./.github/actions/do_build_ock
         with:
-#          external_clc: ${{ needs.set-windows-vars.outputs.workspacelinux }}
-          external_clc: "'${{ github.workspace }}/build/bin/clc.exe'"
+          external_clc: "${{ github.workspace }}/build/bin/clc.exe"
 
           build_targets: check-ock
           enable_api: ""
@@ -135,7 +102,7 @@ jobs:
         with:
           build_targets: check-ock
           runtime_compiler_enabled: OFF
-          external_clc: "'../build/bin/clc.exe'"
+          external_clc: "${{ github.workspace }}/build/bin/clc.exe"
           shell_to_use: pwsh
           gtest_launcher: "python3;-u;${{ github.workspace }}/scripts/gtest-terse-runner.py"
           debug_support: ON