bundle codeql bundle

Author: jsinglet

.github/workflows/internal-build-release-linux64.yml

@@ -37,12 +37,33 @@ jobs:
         chmod +x ./src/CodeQLToolkit.Core/bin/Release/net6.0/publish/linux-x64/qlt
         chmod +r -R ./src/CodeQLToolkit.Core/bin/Release/net6.0/publish/linux-x64        
         
+
+    - uses: actions/setup-python@v5
+      with:
+        python-version: '3.11'
+
+    - name: Build CodeQL Bundle Tool for Packaging
+      shell: pwsh 
+      run: |
+        # need this for the bundling to work. 
+        pip install -U pyinstaller 
+
+        ./scripts/build_codeql_bundle_dist.ps1 -Version 0.2.0 -WorkDirectory dist -DestinationDirectory ./src/CodeQLToolkit.Core/bin/Release/net6.0/publish/linux-x64/tools/
+
+
+    - name: Build Bundle Archive
+      shell: bash
+      run: |
+        echo "Current Directory $(pwd)"
+
         # create bundle 
         ARCHIVE="$(pwd)/qlt-linux-x86_64.zip"        
         pushd ./src/CodeQLToolkit.Core/bin/Release/net6.0/publish/linux-x64
         zip -r $ARCHIVE .
         popd
 
+
+
     - name: Upload build artifacts
       uses: actions/upload-artifact@v3
       with:

scripts/build_codeql_bundle_dist.ps1

@@ -4,23 +4,29 @@ param(
     $Version,
     [Parameter(Mandatory=$true)] 
     [string]
-    $OutputDirectory       
+    $WorkDirectory,      
+
+    [Parameter(Mandatory=$true)] 
+    [string]
+    $DestinationDirectory       
 )
 
+if (-not (Test-Path $WorkDirectory)) {
+    New-Item -ItemType Directory -Path $WorkDirectory | Out-Null
+}
 
-# create output directory if it doesn't exist 
-if (-not (Test-Path $OutputDirectory)) {
-    New-Item -ItemType Directory -Path $OutputDirectory | Out-Null
+if (-not (Test-Path $DestinationDirectory)) {
+    New-Item -ItemType Directory -Path $DestinationDirectory | Out-Null
 }
 
 # download a copy of the release from GitHub
-gh release download "v$Version" --repo https://github.com/rvermeulen/codeql-bundle  -D $OutputDirectory -A zip
+gh release download "v$Version" --repo https://github.com/rvermeulen/codeql-bundle  -D $WorkDirectory -A zip
 
 # extract the zip file
-Expand-Archive -Path "$OutputDirectory\codeql-bundle-$Version.zip" -DestinationPath $OutputDirectory
+Expand-Archive -Path "$WorkDirectory\codeql-bundle-$Version.zip" -DestinationPath $WorkDirectory
 
 # creates a directory named `codeql-bundle-<version>`
-$ArchiveDirectory = Join-Path $OutputDirectory "codeql-bundle-$Version"
+$ArchiveDirectory = Join-Path $WorkDirectory "codeql-bundle-$Version"
 
 Push-Location $ArchiveDirectory
 
@@ -36,13 +42,17 @@ Push-Location "codeql_bundle"
 # pyinstaller should also be installed  
 pyinstaller -F -n codeql_bundle cli.py
 
-
 Pop-Location 
 Pop-Location 
 
-$OutputFile = Join-Path $ArchiveDirectory "codeql_bundle" "dist" "codeql_bundle.exe"
+if($IsWindows){
+    $OutputFile = Join-Path $ArchiveDirectory "codeql_bundle" "dist" "codeql_bundle.exe"
+}else{
+    $OutputFile = Join-Path $ArchiveDirectory "codeql_bundle" "dist" "codeql_bundle"
+}
+
 
 # this will output the binary in the `dist` directory - we should copy that binary the toplevel directory.
-Copy-Item -Path $OutputFile -Destination $OutputDirectory
+Copy-Item -Path $OutputFile -Destination $DestinationDirectory
 
 

src/CodeQLToolkit.Core/CodeQLToolkit.Core.csproj

@@ -30,6 +30,5 @@
     <None Update="ver.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-  </ItemGroup>
-
+  </ItemGroup>	
 </Project>