From 484977687e6914c724487df106084930ab199f09 Mon Sep 17 00:00:00 2001
From: Ryan Volz <ryan.volz@gmail.com>
Date: Fri, 21 May 2021 12:39:58 -0400
Subject: [PATCH] Test some more build action tweaks.

---
 .github/workflows/build_radioconda.yml | 40 ++++++++++++++------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build_radioconda.yml b/.github/workflows/build_radioconda.yml
index c1ee207..ea0021a 100644
--- a/.github/workflows/build_radioconda.yml
+++ b/.github/workflows/build_radioconda.yml
@@ -48,8 +48,7 @@ jobs:
         with:
           environment-file: buildenv.yaml
 
-      - name: Build installer (bash)
-        # if: runner.os != 'Windows'
+      - name: Build installer
         shell: bash -l {0}
         env:
           PLATFORM: ${{ matrix.PLATFORM }}
@@ -60,16 +59,6 @@ jobs:
           fi
           python build_installer.py -v
 
-      #   - name: Build installer (cmd.exe)
-      #     if: runner.os == 'Windows'
-      #     shell: powershell
-      #     env:
-      #       PLATFORM: ${{ matrix.PLATFORM }}
-      #     run: |
-      #       $Env:Path = "$Env:CONDA_PREFIX\NSIS;$Env:Path"
-      #       echo $Env:Path
-      #       python build_installer.py -v
-
       - name: Build metapackage
         shell: bash -l {0}
         env:
@@ -77,7 +66,7 @@ jobs:
         run: |
           python build_metapackage.py installer_specs/$DISTNAME-$PLATFORM.txt
 
-      - name: Copy spec and list built installers and packages
+      - name: Copy lock file and list built installers and packages
         shell: bash
         env:
           PLATFORM: ${{ matrix.PLATFORM }}
@@ -107,9 +96,24 @@ jobs:
           TARGET_VOLUME: CurrentUserHomeDirectory
           INSTALL_PATH: ${{ github.workspace }}/../../../${{ env.DISTNAME }}
         run: |
-          installer -showChoiceChangesXML -pkg dist/$DISTNAME-*-$OS_NAME-$ARCH.pkg > pkg-choices.xml
-          cat pkg-choices.xml
-          installer -verbose -dumplog -pkg dist/$DISTNAME-*-$OS_NAME-$ARCH.pkg -target $TARGET_VOLUME
+          cat >pkg-choices.xml <<EOF
+          <?xml version="1.0" encoding="UTF-8"?>
+          <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+          <plist version="1.0">
+          <array>
+              <dict>
+                  <key>attributeSetting</key>
+                  <integer>0</integer>
+                  <key>choiceAttribute</key>
+                  <string>selected</string>
+                  <key>choiceIdentifier</key>
+                  <string>io.continuum.pkg.pathupdate</string>
+              </dict>
+          </array>
+          </plist>
+          EOF
+          installer -showChoicesAfterApplyingChangesXML pkg-choices.xml -pkg dist/$DISTNAME-*-$OS_NAME-$ARCH.pkg -target $TARGET_VOLUME
+          installer -verbose -dumplog -applyChoiceChangesXML pkg-choices.xml -pkg dist/$DISTNAME-*-$OS_NAME-$ARCH.pkg -target $TARGET_VOLUME
           eval "$($INSTALL_PATH/bin/conda shell.bash hook)"
           conda info
           conda list
@@ -166,5 +170,5 @@ jobs:
         env:
           ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_API_TOKEN }}
         run: |
-          micromamba --info
-          anaconda upload -l $METAPACKAGE_LABEL dist/conda-bld/**/*
+          micromamba --help
+          anaconda upload -l $METAPACKAGE_LABEL --skip-existing dist/conda-bld/**/*