Keep the public repository in sync with the slb internal one.

azure/openzgy-windows.yml

@@ -144,6 +144,13 @@ jobs:
         publishVstsFeed: 'ad4cb17d-525f-488d-93b3-3903b262a93b'
       displayName: 'Publish nuget package'
 
+    - task: NuGetCommand@2
+      inputs:
+        command: 'push'
+        packagesToPush: '$(Build.SourcesDirectory)/*.nupkg;'
+        nuGetFeedType: 'external'
+        publishFeedCredentials: 'PetrelLibraries'
+
     - task: PublishBuildArtifacts@1
       inputs:
         pathToPublish: $(Build.ArtifactStagingDirectory)

azure/templates/windows-build-steps.yml

@@ -28,6 +28,7 @@ steps:
 - bash: |
     echo 'parameters.havesd: ${{parameters.havesd}}'
     eval $(test ! -x openzgy/private/grabtoken.sh || bash openzgy/private/grabtoken.sh -vv)
+    ls -la '$(Build.SourcesDirectory)\openzgy\build\deploy\native\${{parameters.platform}}\${{parameters.configuration}}'
     '$(Build.SourcesDirectory)\openzgy\build\deploy\native\${{parameters.platform}}\${{parameters.configuration}}\OpenZGY.Test.exe'
   env:
     OPENZGY_SDURL: $(SEISMIC_STORE_URL)

scripts/openzgy.autopkg

@@ -25,9 +25,9 @@ nuget {
         [x64,release,dynamic] {
             bin += ${x64_release}\OpenZGY.dll;
             bin += ${x64_release}\zfp.dll;
-			bin += ${x64_debug}\OpenZGY.Tools.BulkInspector.exe;
-			bin += ${x64_debug}\OpenZGY.Tools.MetaInspector.exe;
-			bin += ${x64_debug}\OpenZGY.Tools.ZgyCopy.exe;
+			bin += ${x64_release}\OpenZGY.Tools.BulkInspector.exe;
+			bin += ${x64_release}\OpenZGY.Tools.MetaInspector.exe;
+			bin += ${x64_release}\OpenZGY.Tools.ZgyCopy.exe;
             
 			lib += {
                 ${x64_release}\OpenZGY.lib;

sd-env/Makefile

@@ -147,3 +147,11 @@ clean:
 
 clobber: clean
 	docker rm --force $(patsubst %,sd-%,$(DISTROS)) || true
+
+# Note: As of 30-Jun-2021 this kludge is needed...
+.PHONY: fix-cmake
+fix-cmake:
+	docker cp sd-omega:/opt/vcpkg/scripts/buildsystems/vcpkg.cmake vcpkg.cmake
+	docker cp vcpkg.cmake sd-bionic:/opt/vcpkg/scripts/buildsystems/vcpkg.cmake
+	docker cp vcpkg.cmake sd-buster:/opt/vcpkg/scripts/buildsystems/vcpkg.cmake
+	$(RM) vcpkg.cmake

sd-env/build-template.sh

@@ -104,10 +104,10 @@ mkdir -p tmp/include tmp/lib/linux64
 # Capture the hash of the OSDU part of SDAPI, and the version of some
 # packages installed by vcpkg.
 echo "LINUX: ${LINUXDISTRO:-unknown}"
-echo "SDAPI: $(git -C /home/me/sdapi rev-parse HEAD)" > tmp/version.txt
+echo "SDAPI: $(cd /home/me/sdapi && git rev-parse HEAD)" > tmp/version.txt
 if [ -x /opt/vcpkg/vcpkg ]
 then
-    echo "VCPKG: $(git -C /opt/vcpkg rev-parse HEAD)" >> tmp/version.txt || true
+    echo "VCPKG: $(cd /opt/vcpkg && git rev-parse HEAD)" >> tmp/version.txt || true
     echo "" >> tmp/version.txt
     echo "AZURE:" >> tmp/version.txt
     sudo date > /dev/null 2>&1 # Skip the first-time lecture.