New linux build workflows

2023-02-16 18:03:40 -07:00 · 2023-02-16 18:03:40 -07:00 · 25f7c29380
commit 25f7c29380
parent 2f347e83e8
27 changed files with 487 additions and 494 deletions
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@ -1,5 +1,5 @@
 # build-linux.yml
-# Reusable workflow that builds the Linux and MacOS versions of Libation.
+# Reusable workflow that builds the Linux and MacOS (x64 and xmd64) versions of Libation.
 ---
 name: build

@ -19,6 +19,7 @@ on:
 env:
  DOTNET_CONFIGURATION: 'Release'
  DOTNET_VERSION: '7.0.x'
+  RELEASE_NAME: 'chardonnay'

 jobs:
  build:
@ -26,8 +27,7 @@ jobs:
    strategy:
      matrix:
        os: [Linux, MacOS]
-        ui: [Avalonia]
-        release_name: [chardonnay]
+        arch: [x64, arm64]
    steps:
      - uses: actions/checkout@v3
      - name: Setup .NET
@ -57,25 +57,50 @@ jobs:
      - name: Publish
        working-directory: ./Source
        run: |
-          dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} Libation${{ matrix.ui }}/Libation${{ matrix.ui }}.csproj -p:PublishProfile=Libation${{ matrix.ui }}/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
-          dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} LoadByOS/${{ matrix.os }}ConfigApp/${{ matrix.os }}ConfigApp.csproj -p:PublishProfile=LoadByOS/Properties/${{ matrix.os }}ConfigApp/PublishProfiles/${{ matrix.os }}Profile.pubxml
-          dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} LibationCli/LibationCli.csproj -p:PublishProfile=LibationCli/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
-          dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} Hangover${{ matrix.ui }}/Hangover${{ matrix.ui }}.csproj -p:PublishProfile=Hangover${{ matrix.ui }}/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
-
-      - name: Zip artifact
-        id: zip
-        working-directory: ./Source/bin/Publish/${{ matrix.os }}-${{ matrix.release_name }}
+          os=${{ matrix.os }}
+          RUNTIME_IDENTIFIER="$(echo ${os,} | sed 's/macOS/osx/')-${{ matrix.arch }}"
+          echo "$RUNTIME_IDENTIFIER"
+          dotnet publish \
+              --runtime "$RUNTIME_IDENTIFIER" \
+              --configuration ${{ env.DOTNET_CONFIGURATION }} \
+              --output bin/Publish/${{ matrix.os }}-${{ matrix.arch }}-${{ env.RELEASE_NAME }} \
+              LibationAvalonia/LibationAvalonia.csproj \
+              -p:PublishProfile=LibationAvalonia/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
+          dotnet publish \
+              --runtime "$RUNTIME_IDENTIFIER" \
+              --configuration ${{ env.DOTNET_CONFIGURATION }} \
+              --output bin/Publish/${{ matrix.os }}-${{ matrix.arch }}-${{ env.RELEASE_NAME }} \
+              LoadByOS/${{ matrix.os }}ConfigApp/${{ matrix.os }}ConfigApp.csproj \
+              -p:PublishProfile=LoadByOS/Properties/${{ matrix.os }}ConfigApp/PublishProfiles/${{ matrix.os }}Profile.pubxml
+          dotnet publish \
+              --runtime "$RUNTIME_IDENTIFIER" \
+              --configuration ${{ env.DOTNET_CONFIGURATION }} \
+              --output bin/Publish/${{ matrix.os }}-${{ matrix.arch }}-${{ env.RELEASE_NAME }} \
+              LibationCli/LibationCli.csproj \
+              -p:PublishProfile=LibationCli/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
+          dotnet publish \
+              --runtime "$RUNTIME_IDENTIFIER" \
+              --configuration ${{ env.DOTNET_CONFIGURATION }} \
+              --output bin/Publish/${{ matrix.os }}-${{ matrix.arch }}-${{ env.RELEASE_NAME }} \
+              HangoverAvalonia/HangoverAvalonia.csproj \
+              -p:PublishProfile=HangoverAvalonia/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
+          
+      - name: Build bundle
+        id: bundle
+        working-directory: ./Source/bin/Publish/${{ matrix.os }}-${{ matrix.arch }}-${{ env.RELEASE_NAME }}
        run: |
-          delfiles=("libmp3lame.x86.dll" "libmp3lame.x64.dll" "ffmpegaac.x86.dll" "ffmpegaac.x64.dll")
-          for n in "${delfiles[@]}"; do rm "$n"; done
-          osbuild="$(echo '${{ matrix.os }}' | tr '[:upper:]' '[:lower:]')"
-          artifact="Libation.${{ steps.get_version.outputs.version }}-${osbuild}-${{ matrix.release_name }}"
+          BUNDLE_DIR=$(pwd)
+          echo "Bundle dir: ${BUNDLE_DIR}"
+          cd ..
+          SCRIPT=../../../Scripts/Bundle_${{ matrix.os }}.sh
+          chmod +rx ${SCRIPT}
+          ${SCRIPT} "${BUNDLE_DIR}" "${{ steps.get_version.outputs.version }}" "${{ matrix.arch }}"
+          artifact=$(ls ./bundle)
          echo "artifact=${artifact}" >> "${GITHUB_OUTPUT}"
-          tar -zcvf "../${artifact}.tar.gz" .
-
-      - name: Publish artifact
+          
+      - name: Publish bundle
        uses: actions/upload-artifact@v3
        with:
-          name: ${{ steps.zip.outputs.artifact }}.tar.gz
-          path: ./Source/bin/Publish/${{ steps.zip.outputs.artifact }}.tar.gz
+          name: ${{ steps.bundle.outputs.artifact }}
+          path: ./Source/bin/Publish/bundle/${{ steps.bundle.outputs.artifact }}
          if-no-files-found: error
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@ -60,21 +60,49 @@ jobs:
      - name: Publish
        working-directory: ./Source
        run: |
-          dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} Libation${{ matrix.ui }}/Libation${{ matrix.ui }}.csproj -p:PublishProfile=Libation${{ matrix.ui }}/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
-          dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} LoadByOS/${{ matrix.os }}ConfigApp/${{ matrix.os }}ConfigApp.csproj -p:PublishProfile=LoadByOS/Properties/${{ matrix.os }}ConfigApp/PublishProfiles/${{ matrix.os }}Profile.pubxml
-          dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} LibationCli/LibationCli.csproj -p:PublishProfile=LibationCli/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
-          dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} Hangover${{ matrix.ui }}/Hangover${{ matrix.ui }}.csproj -p:PublishProfile=Hangover${{ matrix.ui }}/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
+          dotnet publish `
+              --configuration ${{ env.DOTNET_CONFIGURATION }} `
+              --output bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} `
+              Libation${{ matrix.ui }}/Libation${{ matrix.ui }}.csproj `
+              -p:PublishProfile=Libation${{ matrix.ui }}/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
+          dotnet publish `
+              --configuration ${{ env.DOTNET_CONFIGURATION }} `
+              --output bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} `
+              LoadByOS/${{ matrix.os }}ConfigApp/${{ matrix.os }}ConfigApp.csproj `
+              -p:PublishProfile=LoadByOS/Properties/${{ matrix.os }}ConfigApp/PublishProfiles/${{ matrix.os }}Profile.pubxml
+          dotnet publish `
+              --configuration ${{ env.DOTNET_CONFIGURATION }} `
+              --output bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} `
+              LibationCli/LibationCli.csproj `
+              -p:PublishProfile=LibationCli/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
+          dotnet publish `
+              --configuration ${{ env.DOTNET_CONFIGURATION }} `
+              --output bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} `
+              Hangover${{ matrix.ui }}/Hangover${{ matrix.ui }}.csproj `
+              -p:PublishProfile=Hangover${{ matrix.ui }}/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml

      - name: Zip artifact
        id: zip
        working-directory: ./Source/bin/Publish
        run: |
-          $dir = "${{ matrix.os }}-${{ matrix.release_name }}\"
-          $delfiles = @("libmp3lame.so", "ffmpegaac.so", "glass-with-glow_256.svg", "Libation.desktop")
-          foreach ($file in $delfiles){ if (test-path $dir$file){ Remove-Item $dir$file } }
+          $bin_dir = "${{ matrix.os }}-${{ matrix.release_name }}\"
+          $delfiles = @(
+            "libmp3lame.x64.so",
+            "libmp3lame.arm64.so",
+            "libmp3lame.x64.dylib",
+            "libmp3lame.arm64.dylib",
+            "ffmpegaac.x64.so",
+            "ffmpegaac.arm64.so",
+            "ffmpegaac.x64.dylib",
+            "ffmpegaac.arm64.dylib",
+            "WindowsConfigApp.exe",
+            "WindowsConfigApp.runtimeconfig.json",
+            "WindowsConfigApp.deps.json"
+            )
+          foreach ($file in $delfiles){ if (test-path $bin_dir$file){ Remove-Item $bin_dir$file } }
          $artifact="${{ matrix.prefix }}Libation.${{ steps.get_version.outputs.version }}-" + "${{ matrix.os }}".ToLower() + "-${{ matrix.release_name }}"
          "artifact=$artifact" >> $env:GITHUB_OUTPUT
-          Compress-Archive -Path "${dir}*" -DestinationPath "$artifact.zip"
+          Compress-Archive -Path "${bin_dir}*" -DestinationPath "$artifact.zip"

      - name: Publish artifact
        uses: actions/upload-artifact@v3
--- a/.github/workflows/bundle-linux.yml
+++ b/.github/workflows/bundle-linux.yml
@ -1,43 +0,0 @@
-# build-linux.yml
-# Reusable workflow that builds the Libation installation bundles for Linux and MacOS.
---
-name: bundle-linux
-
-on:
-  workflow_call:
-    inputs:
-      version:
-        type: string
-        description: 'Version number'
-        required: true
-
-jobs:
-  bundle:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        os: [linux, macos]
-        release_name: [chardonnay]
-    steps:
-      - uses: actions/checkout@v3
-      
-      - name: Download Artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: "Libation.${{ inputs.version }}-${{ matrix.os }}-${{ matrix.release_name }}.tar.gz"
-          
-      - name: Build bundle
-        id: build
-        run: |
-          SCRIPT=targz2${{ matrix.os }}bundle.sh
-          chmod +rwx ./Scripts/${SCRIPT}
-          ./Scripts/${SCRIPT} "Libation.${{ inputs.version }}-${{ matrix.os }}-${{ matrix.release_name }}.tar.gz" ${{ inputs.version }}
-          artifact=$(ls ./bundle)
-          echo "artifact=${artifact}" >> "${GITHUB_OUTPUT}"
-          
-      - name: Publish bundle
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ steps.build.outputs.artifact }}
-          path: ./bundle/${{ steps.build.outputs.artifact }}
-          if-no-files-found: error
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -33,15 +33,9 @@ jobs:
    with:
      version_override: ${{ needs.prerelease.outputs.version }}
      run_unit_tests: false
-
-  bundle:
-    needs: [prerelease,build]
-    uses: ./.github/workflows/bundle-linux.yml
-    with:
-      version: ${{ needs.prerelease.outputs.version }}
      
  release:
-    needs: [prerelease,build,bundle]
+    needs: [prerelease,build]
    runs-on: ubuntu-latest
    steps:
      - name: Download artifacts