H-G-Hristov · March 14, 2019 15:35 · Mar 14, 2019 · Mar 14, 2019 · Mar 14, 2019 · Mar 14, 2019
diff --git a/appveyor.yml b/appveyor.yml
@@ -29,12 +29,15 @@ cache:
 # Scripts that are called at very beginning, before repo cloning
 init:
   - ps: |
+      $env:AppveyorModulesPath="$env:APPVEYOR_BUILD_FOLDER/../PS_Modules/"
+      mkdir -p $env:AppveyorModulesPath
+      
       ################################################
       # Helper functions
       ################################################
       
       # Write out a Script Module to a file
-      Set-Content -Path "$env:APPVEYOR_BUILD_FOLDER/$AppveyorCI_Functions.psm1" -Value `
+      Set-Content -Path "$env:AppveyorModulesPath/$AppveyorCI_Functions.psm1" -Value `
       @'
         function Get-CannonicalPath
         {
@@ -147,7 +150,7 @@ init:
       # Include common functions
       ################################################
       
-      Import-Module "$env:APPVEYOR_BUILD_FOLDER/$AppveyorCI_Functions.psm1"
+      Import-Module "$env:AppveyorModulesPath/$AppveyorCI_Functions.psm1"
       
       ################################################
       # Set environment variables
@@ -228,7 +231,7 @@ install:
       # Include common functions
       ################################################
       
-      Import-Module "$env:APPVEYOR_BUILD_FOLDER/$AppveyorCI_Functions.psm1"
+      Import-Module "$env:AppveyorModulesPath/$AppveyorCI_Functions.psm1"
       
       Write-EnvVariables
       
@@ -297,7 +300,7 @@ build_script:
       # Include common functions
       ################################################
       
-      Import-Module "$env:APPVEYOR_BUILD_FOLDER/$AppveyorCI_Functions.psm1"
+      Import-Module "$env:AppveyorModulesPath/$AppveyorCI_Functions.psm1"
       
       Write-EnvVariables
       

diff --git a/appveyor.yml b/appveyor.yml
@@ -147,7 +147,7 @@ init:
       # Include common functions
       ################################################
       
-      Import-Module "../$AppveyorCI_Functions.psm1"
+      Import-Module "$env:APPVEYOR_BUILD_FOLDER/$AppveyorCI_Functions.psm1"
       
       ################################################
       # Set environment variables

diff --git a/appveyor.yml b/appveyor.yml
@@ -34,7 +34,7 @@ init:
       ################################################
       
       # Write out a Script Module to a file
-      Set-Content -Path "../$AppveyorCI_Functions.psm1" -Value `
+      Set-Content -Path "$env:APPVEYOR_BUILD_FOLDER/$AppveyorCI_Functions.psm1" -Value `
       @'
         function Get-CannonicalPath
         {
@@ -228,7 +228,7 @@ install:
       # Include common functions
       ################################################
       
-      Import-Module "../$AppveyorCI_Functions.psm1"
+      Import-Module "$env:APPVEYOR_BUILD_FOLDER/$AppveyorCI_Functions.psm1"
       
       Write-EnvVariables
       
@@ -297,7 +297,7 @@ build_script:
       # Include common functions
       ################################################
       
-      Import-Module "../$AppveyorCI_Functions.psm1"
+      Import-Module "$env:APPVEYOR_BUILD_FOLDER/$AppveyorCI_Functions.psm1"
       
       Write-EnvVariables
       

diff --git a/appveyor.yml b/appveyor.yml
@@ -234,6 +234,7 @@ install:
       
       ################################################
       
+      # Install packages
       if ("Windows" -eq $env:TargetPlatform)
       {
         if ("Ninja" -eq $env:Generator)
@@ -265,20 +266,7 @@ install:
         ninja --version
       }
       
-# Custom build scripts that run instead of automatic MSBuild
-build_script:
-  - ps: |
-      ################################################
-      # Include common functions
-      ################################################
-      
-      Import-Module "../$AppveyorCI_Functions.psm1"
-      
-      Write-EnvVariables
-      
-      ################################################
-      
-      # Install packages
+      # Install vcpkg packages
       if (-not (Test-Path $env:vcpkgCachePath))
       {
         Write-Host "Cloning vcpkg..."
@@ -302,6 +290,19 @@ build_script:
         ./vcpkg install --recurse --triplet $env:vcpkgTriplet freetype sdl2
       }
       
+# Custom build scripts that run instead of automatic MSBuild
+build_script:
+  - ps: |
+      ################################################
+      # Include common functions
+      ################################################
+      
+      Import-Module "../$AppveyorCI_Functions.psm1"
+      
+      Write-EnvVariables
+      
+      ################################################
+
       # Setup build environment
       if (("Windows" -eq $env:TargetPlatform) `
         -and ("Ninja" -eq $env:Generator))
@@ -336,6 +337,7 @@ build_script:
         '"../../GunBox"'
       )
       $cmakeArgumentList = [System.Environment]::ExpandEnvironmentVariables($cmakeArguments)      
+      Write-Host "`$cmakeArgumentList -> $cmakeArgumentList"
       
       Write-Host "`nCMake configuration started...`n"
       

diff --git a/appveyor.yml b/appveyor.yml
@@ -249,7 +249,11 @@ install:
         
         # "apt" options: -y - "yes", -q - "quiet"
         sudo apt-get -yq update | Out-Null
-        sudo apt-get install ninja-build | Out-Null
+        
+        # Applications
+        sudo apt-get -yq install ninja-build | Out-Null
+        # Libraries
+        sudo apt-get -yq install libgl1-mesa-dev | Out-Null
       }
       else
       {

diff --git a/appveyor.yml b/appveyor.yml
@@ -13,7 +13,7 @@ configuration:
 
 environment:
   RemoteSessionOnExit_Enabled:
-    true
+    false
   CoverityScan_Enabled:
     false
   CoverityScanToken:

diff --git a/appveyor.yml b/appveyor.yml
@@ -15,7 +15,7 @@ environment:
   RemoteSessionOnExit_Enabled:
     true
   CoverityScan_Enabled:
-    true
+    false
   CoverityScanToken:
     secure: R5iKcUqFlDHXEM5mD8NMvlRqKF2yIEQH+0ZvrsLBrOE=
   CoverityScanEmail:
@@ -342,7 +342,8 @@ build_script:
       
       # Run Coverity Scan on forced builds (via the "New Build" option)
       if (($true -eq $env:CoverityScan_Enabled) `
-        -and ($true -eq $env:APPVEYOR_FORCED_BUILD))
+        -and ($true -eq $env:APPVEYOR_FORCED_BUILD) `
+        -and ($true -eq $isWindows))
       {
         cov-build --dir cov-int/ cmake --build .
         
@@ -389,8 +390,8 @@ build_script:
 on_finish:
   # Uncomment to enable a Remote Desktop session
   - ps: |
-     if ($env:RemoteSessionOnExit_Enabled `
-       -and $isWindows)
+     if (($true -eq $env:RemoteSessionOnExit_Enabled) `
+       -and ($true -eq $isWindows))
      {
        $blockRdp = $true;
        iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

diff --git a/appveyor.yml b/appveyor.yml
@@ -389,7 +389,8 @@ build_script:
 on_finish:
   # Uncomment to enable a Remote Desktop session
   - ps: |
-     if ($env:RemoteSessionOnExit_Enabled -and $isWindows)
+     if ($env:RemoteSessionOnExit_Enabled `
+       -and $isWindows)
      {
        $blockRdp = $true;
        iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

diff --git a/appveyor.yml b/appveyor.yml
@@ -389,8 +389,7 @@ build_script:
 on_finish:
   # Uncomment to enable a Remote Desktop session
   - ps: |
-     if (($env:RemoteSessionOnExit_Enabled) `
-       -and ($isWindows))
+     if ($env:RemoteSessionOnExit_Enabled -and $isWindows)
      {
        $blockRdp = $true;
        iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

diff --git a/appveyor.yml b/appveyor.yml
@@ -389,7 +389,8 @@ build_script:
 on_finish:
   # Uncomment to enable a Remote Desktop session
   - ps: |
-     if ($env:RemoteSessionOnExit_Enabled)
+     if (($env:RemoteSessionOnExit_Enabled) `
+       -and ($isWindows))
      {
        $blockRdp = $true;
        iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

diff --git a/appveyor.yml b/appveyor.yml
@@ -3,7 +3,7 @@ version: 1.0.0.{build}
 
 image:
   - Ubuntu
-  - Visual Studio 2017
+#  - Visual Studio 2017
 
 platform: x64
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -3,7 +3,7 @@ version: 1.0.0.{build}
 
 image:
   - Ubuntu
-#  - Visual Studio 2017
+  - Visual Studio 2017
 
 platform: x64
 
@@ -12,6 +12,8 @@ configuration:
 #  - Release
 
 environment:
+  RemoteSessionOnExit_Enabled:
+    true
   CoverityScan_Enabled:
     true
   CoverityScanToken:
@@ -293,7 +295,7 @@ build_script:
           return Stop-AppveyorBuild "Unknown target platform: $env:TargetPlatform"
         }
         
-        vcpkg install --recurse --triplet $env:vcpkgTriplet freetype sdl2
+        ./vcpkg install --recurse --triplet $env:vcpkgTriplet freetype sdl2
       }
       
       # Setup build environment
@@ -386,10 +388,16 @@ build_script:
 # Scripts that run after build success/failure 
 on_finish:
   # Uncomment to enable a Remote Desktop session
-  #- ps: |
-  #   $blockRdp = $true;
-  #   iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+  - ps: |
+     if ($env:RemoteSessionOnExit_Enabled)
+     {
+       $blockRdp = $true;
+       iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+     }
   # Uncomment to enable SSH connection
   - sh: |
-      export APPVEYOR_SSH_BLOCK=true
-      curl -sflL 'https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-ssh.sh' | bash -e -
+      if [ ${RemoteSessionOnExit_Enabled} ]
+      then
+        export APPVEYOR_SSH_BLOCK=true
+        curl -sflL 'https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-ssh.sh' | bash -e -
+      fi
diff --git a/appveyor.yml b/appveyor.yml
@@ -204,7 +204,10 @@ init:
       $env:vcpkgCachePath = Get-CannonicalPath -FullPathName $vcpkgCachePath
       
       # Date & Version variables
-      #Set-TimeZone -Name "FLE Standard Time"
+      if ($isWindows)
+      {
+        Set-TimeZone -Name "FLE Standard Time"
+      }
       #   Get a sortable timestamp:
       #      https://docs.microsoft.com/en-us/dotnet/api/system.globalization.datetimeformatinfo?view=netframework-4.7.2
       $timestamp = Get-Date -format s | foreach {$_ -replace ":", "-"}
@@ -272,10 +275,10 @@ build_script:
       # Install packages
       if (-not (Test-Path $env:vcpkgCachePath))
       {
-        Write-Host "Cloning `"vcpkg`"..."
+        Write-Host "Cloning vcpkg..."
         git clone -q https://github.com/Microsoft/vcpkg.git
         
-        Write-Host "Rebuilding `"vcpkg`"..."
+        Write-Host "Rebuilding vcpkg..."
         cd $env:VCPKG_ROOT
         if ("Windows" -eq $env:TargetPlatform)
         {

diff --git a/appveyor.yml b/appveyor.yml
@@ -276,9 +276,7 @@ build_script:
         git clone -q https://github.com/Microsoft/vcpkg.git
         
         Write-Host "Rebuilding `"vcpkg`"..."
-        Write-Host "env:VCPKG_ROOT $env:VCPKG_ROOT"
         cd $env:VCPKG_ROOT
-        
         if ("Windows" -eq $env:TargetPlatform)
         {
           ./bootstrap-vcpkg.bat
@@ -293,8 +291,6 @@ build_script:
         }
         
         vcpkg install --recurse --triplet $env:vcpkgTriplet freetype sdl2
-        
-        cd $env:APPVEYOR_BUILD_FOLDER
       }
       
       # Setup build environment
@@ -318,9 +314,10 @@ build_script:
       mkdir -p $env:BuildPath
       mkdir -p $env:InstallPath
       
+      # Configure CMake project
       cd $env:BuildPath
       
-      # Set CMake arguments
+      # Setup CMake arguments
       $cmakeArguments = @(
         '-G"%Generator%"',
         '-D"CMAKE_BUILD_TYPE:STRING=%CONFIGURATION%"',
@@ -331,10 +328,11 @@ build_script:
       )
       $cmakeArgumentList = [System.Environment]::ExpandEnvironmentVariables($cmakeArguments)      
       
-      # Configure CMake project
       Write-Host "`nCMake configuration started...`n"
+      
       cmake --version
       Invoke-Executable -FilePath "cmake" -ArgumentList $cmakeArgumentList
+      
       Write-Host "`nCMake configuration completed...`n"
       
       # Run Coverity Scan on forced builds (via the "New Build" option)

diff --git a/appveyor.yml b/appveyor.yml
@@ -195,7 +195,7 @@ init:
       $installPath = "$env:APPVEYOR_BUILD_FOLDER/__install-output/$env:vcpkgTriplet-$env:CONFIGURATION"
       $vcpkgRoot = "$env:APPVEYOR_BUILD_FOLDER/vcpkg"
       $vcpkgRoot = [System.Environment]::ExpandEnvironmentVariables($vcpkgRoot)
-      $vcpkgCachePath = "$env:vcpkgRoot/installed"
+      $vcpkgCachePath = "$vcpkgRoot/installed"
       
       $env:ArchivePath = Get-CannonicalPath -FullPathName $archivePath
       $env:BuildPath = Get-CannonicalPath -FullPathName $buildPath

diff --git a/appveyor.yml b/appveyor.yml
@@ -125,6 +125,7 @@ init:
           Write-Host "      `$env:ArchivePath                  = $env:ArchivePath"
           Write-Host "      `$env:BuildPath                    = $env:BuildPath"
           Write-Host "      `$env:InstallPath                  = $env:InstallPath"
+          Write-Host "      `$env:VCPKG_ROOT                   = $env:VCPKG_ROOT"
           Write-Host "      `$env:vcpkgCachePath               = $env:vcpkgCachePath"
           Write-Host "  - Date & Version variables"
           Write-Host "      `$env:BuildVersion                 = $env:BuildVersion"

diff --git a/appveyor.yml b/appveyor.yml
@@ -12,8 +12,6 @@ configuration:
 #  - Release
 
 environment:
-  VCPKG_ROOT:
-    "%APPVEYOR_BUILD_FOLDER%/vcpkg"
   CoverityScan_Enabled:
     true
   CoverityScanToken:
@@ -194,12 +192,14 @@ init:
       $archivePath = "$env:APPVEYOR_BUILD_FOLDER/__archive-output/$env:vcpkgTriplet-$env:CONFIGURATION"
       $buildPath = "$env:APPVEYOR_BUILD_FOLDER/__build-output/$env:vcpkgTriplet-$env:CONFIGURATION"
       $installPath = "$env:APPVEYOR_BUILD_FOLDER/__install-output/$env:vcpkgTriplet-$env:CONFIGURATION"
-      $vcpkgCachePath = "$env:VCPKG_ROOT/installed"
-      $vcpkgCachePath = [System.Environment]::ExpandEnvironmentVariables($vcpkgCachePath)
+      $vcpkgRoot = "$env:APPVEYOR_BUILD_FOLDER/vcpkg"
+      $vcpkgRoot = [System.Environment]::ExpandEnvironmentVariables($vcpkgRoot)
+      $vcpkgCachePath = "$env:vcpkgRoot/installed"
       
       $env:ArchivePath = Get-CannonicalPath -FullPathName $archivePath
       $env:BuildPath = Get-CannonicalPath -FullPathName $buildPath
       $env:InstallPath = Get-CannonicalPath -FullPathName $installPath
+      $env:VCPKG_ROOT = Get-CannonicalPath -FullPathName $vcpkgRoot
       $env:vcpkgCachePath = Get-CannonicalPath -FullPathName $vcpkgCachePath
       
       # Date & Version variables

diff --git a/appveyor.yml b/appveyor.yml
@@ -275,6 +275,7 @@ build_script:
         git clone -q https://github.com/Microsoft/vcpkg.git
         
         Write-Host "Rebuilding `"vcpkg`"..."
+        Write-Host "env:VCPKG_ROOT $env:VCPKG_ROOT"
         cd $env:VCPKG_ROOT
         
         if ("Windows" -eq $env:TargetPlatform)

diff --git a/appveyor.yml b/appveyor.yml
@@ -224,6 +224,8 @@ install:
       
       Import-Module "../$AppveyorCI_Functions.psm1"
       
+      Write-EnvVariables
+      
       ################################################
       
       if ("Windows" -eq $env:TargetPlatform)
@@ -269,11 +271,12 @@ build_script:
       # Install packages
       if (-not (Test-Path $env:vcpkgCachePath))
       {
-        Write-Host "Cloning `vcpkg`..."
+        Write-Host "Cloning `"vcpkg`"..."
         git clone -q https://github.com/Microsoft/vcpkg.git
         
-        Write-Host "Rebuilding `vcpkg`..."
+        Write-Host "Rebuilding `"vcpkg`"..."
         cd $env:VCPKG_ROOT
+        
         if ("Windows" -eq $env:TargetPlatform)
         {
           ./bootstrap-vcpkg.bat

diff --git a/appveyor.yml b/appveyor.yml
@@ -2,8 +2,8 @@
 version: 1.0.0.{build}
 
 image:
-#  - Ubuntu
-  - Visual Studio 2017
+  - Ubuntu
+#  - Visual Studio 2017
 
 platform: x64
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -2,8 +2,8 @@
 version: 1.0.0.{build}
 
 image:
-  - Ubuntu
-#  - Visual Studio 2017
+#  - Ubuntu
+  - Visual Studio 2017
 
 platform: x64
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -309,9 +309,9 @@ build_script:
       }
       
       # Create output paths
-      mkdir $env:ArchivePath
-      mkdir $env:BuildPath
-      mkdir $env:InstallPath
+      mkdir -p $env:ArchivePath
+      mkdir -p $env:BuildPath
+      mkdir -p $env:InstallPath
       
       cd $env:BuildPath
       

diff --git a/appveyor.yml b/appveyor.yml
@@ -380,4 +380,10 @@ build_script:
 # Scripts that run after build success/failure 
 on_finish:
   # Uncomment to enable a Remote Desktop session
-  #- pwsh: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+  #- ps: |
+  #   $blockRdp = $true;
+  #   iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+  # Uncomment to enable SSH connection
+  - sh: |
+      export APPVEYOR_SSH_BLOCK=true
+      curl -sflL 'https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-ssh.sh' | bash -e -
diff --git a/appveyor.yml b/appveyor.yml
@@ -241,7 +241,7 @@ install:
         
         # "apt" options: -y - "yes", -q - "quiet"
         sudo apt-get -yq update | Out-Null
-        sudo apt-get install ninja | Out-Null
+        sudo apt-get install ninja-build | Out-Null
       }
       else
       {
@@ -250,7 +250,7 @@ install:
       
       if ("Ninja" -eq $env:Generator)
       {
-        sudo ninja --version
+        ninja --version
       }
       
 # Custom build scripts that run instead of automatic MSBuild

diff --git a/appveyor.yml b/appveyor.yml
@@ -250,7 +250,7 @@ install:
       
       if ("Ninja" -eq $env:Generator)
       {
-        ninja --version
+        sudo ninja --version
       }
       
 # Custom build scripts that run instead of automatic MSBuild

diff --git a/appveyor.yml b/appveyor.yml
@@ -262,6 +262,8 @@ build_script:
       
       Import-Module "../$AppveyorCI_Functions.psm1"
       
+      Write-EnvVariables
+      
       ################################################
       
       # Install packages

diff --git a/appveyor.yml b/appveyor.yml
@@ -232,8 +232,6 @@ install:
         {
           $env:PIP_DISABLE_PIP_VERSION_CHECK = 1
           pip install ninja
-          
-          ninja --version
         }
       }
       elseif ("Linux" -eq $env:TargetPlatform)
@@ -250,6 +248,11 @@ install:
         return Stop-AppveyorBuild "Unknown target platform: $env:TargetPlatform"
       }
       
+      if ("Ninja" -eq $env:Generator)
+      {
+        ninja --version
+      }
+      
 # Custom build scripts that run instead of automatic MSBuild
 build_script:
   - ps: |

diff --git a/appveyor.yml b/appveyor.yml
@@ -239,7 +239,7 @@ install:
       elseif ("Linux" -eq $env:TargetPlatform)
       {
         # Set non-interactive frontend for "debconf" to prevent errors in the script
-        $env:DEBIAN_FRONTEND = noninteractive
+        $env:DEBIAN_FRONTEND = "noninteractive"
         
         # "apt" options: -y - "yes", -q - "quiet"
         sudo apt-get -yq update | Out-Null

diff --git a/appveyor.yml b/appveyor.yml
@@ -264,18 +264,18 @@ build_script:
       # Install packages
       if (-not (Test-Path $env:vcpkgCachePath))
       {
-        # Update vcpkg
+        Write-Host "Cloning `vcpkg`..."
         git clone -q https://github.com/Microsoft/vcpkg.git
         
-        # Uncomment to rebuild vcpkg
+        Write-Host "Rebuilding `vcpkg`..."
         cd $env:VCPKG_ROOT
         if ("Windows" -eq $env:TargetPlatform)
         {
           ./bootstrap-vcpkg.bat
         }
         elseif ("Linux" -eq $env:TargetPlatform)
         {
-          ./bootstrap-vcpkg.sh
+          . ./bootstrap-vcpkg.sh
         }
         else
         {

diff --git a/appveyor.yml b/appveyor.yml
@@ -195,6 +195,7 @@ init:
       $buildPath = "$env:APPVEYOR_BUILD_FOLDER/__build-output/$env:vcpkgTriplet-$env:CONFIGURATION"
       $installPath = "$env:APPVEYOR_BUILD_FOLDER/__install-output/$env:vcpkgTriplet-$env:CONFIGURATION"
       $vcpkgCachePath = "$env:VCPKG_ROOT/installed"
+      $vcpkgCachePath = [System.Environment]::ExpandEnvironmentVariables($vcpkgCachePath)
       
       $env:ArchivePath = Get-CannonicalPath -FullPathName $archivePath
       $env:BuildPath = Get-CannonicalPath -FullPathName $buildPath
No results found