enable package export

mixxxdj · Nov 12, 2023 · 3c7d253 · 3c7d253
1 parent b7470ce
commit 3c7d253
Showing 1 changed file with 25 additions and 25 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -105,38 +105,38 @@ jobs:
         name: logs-${{ matrix.vcpkg_triplet }}
         path: ${{ matrix.vcpkg_path  }}/buildtrees/**/*.log
 
-    #- name: Create buildenv archive
-    #  run: ./vcpkg export --vcpkg-root=${{ matrix.vcpkg_path }} --x-all-installed --zip --output=${{ env.DEPS_BASE_NAME }}-${{ env.MIXXX_VERSION }}-${{ matrix.vcpkg_triplet }}-${{ steps.vars.outputs.sha_short }}
-    #  working-directory: ${{ matrix.vcpkg_path }}
+    - name: Create buildenv archive
+      run: ./vcpkg export --vcpkg-root=${{ matrix.vcpkg_path }} --x-all-installed --zip --output=${{ env.DEPS_BASE_NAME }}-${{ env.MIXXX_VERSION }}-${{ matrix.vcpkg_triplet }}-${{ steps.vars.outputs.sha_short }} --output-dir=${{ matrix.vcpkg_path }}
+      working-directory: ${{ matrix.vcpkg_path }}
 
-    #- name: "[Windows] Install additional tools"
-    #  if: runner.os == 'Windows' && env.SSH_PASSWORD != null
-    #  env:
-    #    SSH_PASSWORD: ${{ secrets.DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY_PASSWORD }}
-    #  run: |
-    #    $Env:PATH="C:\msys64\usr\bin;$Env:PATH"
-    #    pacman -S --noconfirm coreutils bash rsync openssh
-    #    Add-Content -Path "$Env:GITHUB_ENV" -Value "PATH=$Env:PATH"
+    - name: "[Windows] Install additional tools"
+      if: runner.os == 'Windows' && env.SSH_PASSWORD != null
+      env:
+        SSH_PASSWORD: ${{ secrets.DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY_PASSWORD }}
+      run: |
+        $Env:PATH="C:\msys64\usr\bin;$Env:PATH"
+        pacman -S --noconfirm coreutils bash rsync openssh
+        Add-Content -Path "$Env:GITHUB_ENV" -Value "PATH=$Env:PATH"
 
-    #- name: "Upload build to downloads.mixxx.org"
-    #  if: github.event_name == 'push' && env.SSH_PASSWORD != null
-    #  run: bash .github/deploy.sh ${{ env.DEPS_BASE_NAME }}-${{ env.MIXXX_VERSION }}-${{ matrix.vcpkg_triplet }}-${{ steps.vars.outputs.sha_short }}.zip
-    #  working-directory: ${{ matrix.vcpkg_path }}
-    #  env:
-    #    DESTDIR: public_html/downloads/dependencies
-    #    OS: ${{ runner.os }}
-    #    SSH_AUTH_SOCK: /tmp/ssh_agent.sock
-    #    SSH_HOST: downloads-hostgator.mixxx.org
-    #    SSH_KEY: ${{ secrets.DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY }}
-    #    SSH_PASSWORD: ${{ secrets.DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY_PASSWORD }}
-    #    SSH_USER: mixxx
-    #    UPLOAD_ID: ${{ github.run_id }}
+    - name: "Upload build to downloads.mixxx.org"
+      if: github.event_name == 'push' && env.SSH_PASSWORD != null
+      run: bash .github/deploy.sh ${{ env.DEPS_BASE_NAME }}-${{ env.MIXXX_VERSION }}-${{ matrix.vcpkg_triplet }}-${{ steps.vars.outputs.sha_short }}.zip
+      working-directory: ${{ matrix.vcpkg_path }}
+      env:
+        DESTDIR: public_html/downloads/dependencies
+        OS: ${{ runner.os }}
+        SSH_AUTH_SOCK: /tmp/ssh_agent.sock
+        SSH_HOST: downloads-hostgator.mixxx.org
+        SSH_KEY: ${{ secrets.DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY }}
+        SSH_PASSWORD: ${{ secrets.DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY_PASSWORD }}
+        SSH_USER: mixxx
+        UPLOAD_ID: ${{ github.run_id }}
 
     - name: Upload GitHub Actions artifacts
       uses: actions/upload-artifact@v3
       with:
         name: ${{ env.DEPS_BASE_NAME }}-${{ env.MIXXX_VERSION }}-${{ matrix.vcpkg_triplet }}-${{ steps.vars.outputs.sha_short }}
-        path: ${{ matrix.vcpkg_path }}/vcpkg_installed
+        path: ${{ matrix.vcpkg_path }}/${{ env.DEPS_BASE_NAME }}-${{ env.MIXXX_VERSION }}-${{ matrix.vcpkg_triplet }}-${{ steps.vars.outputs.sha_short }}.zip
 
     # Workaround for https://github.com/actions/cache/issues/531
     - name: Use system tar & zstd from Chocolatey for caching