CCS-4399 Fix double zipped artefacts

DolbyIO · Jan 16, 2023 · c2e5f9f · c2e5f9f
1 parent 5fe26c1
commit c2e5f9f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 84 deletions.
diff --git a/.github/actions/zip_artifact/bash/action.yml b/.github/actions/zip_artifact/bash/action.yml
diff --git a/.github/actions/zip_artifact/bash/zip_artifact.sh b/.github/actions/zip_artifact/bash/zip_artifact.sh
diff --git a/.github/actions/zip_artifact/powershell/action.yml b/.github/actions/zip_artifact/powershell/action.yml
diff --git a/.github/actions/zip_artifact/powershell/zip_artifact.ps1 b/.github/actions/zip_artifact/powershell/zip_artifact.ps1
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,14 +1,15 @@
 name: Build Unreal Plugin
 
-on: push
-# nom, wydaje mi sie develop main tag -> jfrog, tag -> github release, wszystko inne -> build, ale dev/null
+on:
+  push:
+  workflow_dispatch:
 
 env:
   CPP_SDK_TAG: "2.1.0"
   CPP_SDK_DESTINATION: "DolbyIO/Source/ThirdParty"
   CPP_SDK_URL: "https://github.com/DolbyIO/comms-sdk-cpp/releases/download"
   UNREAL_PLUGIN_OUTPUT: "Build/DolbyIO"
-  RETENTION: 8
+  RETENTION: 14
 
 jobs:
   build-macos:
@@ -17,12 +18,11 @@ jobs:
       matrix:
         version: ["4.27", "5.0"]
     runs-on: ["self-hosted", "X64", "macOS"]
-    # User matrix for 4.27.2 and 5.0.3
     env:
       BUILD_PLATFORM: 'macos64'
     steps:
       - name: Code checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Download C++ SDK release asset
         uses: ./.github/actions/download_cpp/bash
         with:
@@ -37,21 +37,14 @@ jobs:
           -TargetPlatforms=Mac \
           -Package=$(pwd)/${{ env.UNREAL_PLUGIN_OUTPUT }} \
           -StrictIncludes
-      - name: Zipping DolbIO Plugin
-        uses: ./.github/actions/zip_artifact/bash
-        with:
-          zip_name: "DolbyIO_UnrealPlugin_${{ matrix.version }}_${{ env.BUILD_PLATFORM }}.zip"
-          src_dir_path: ${{ env.UNREAL_PLUGIN_OUTPUT }}
       - name: Archive DolbyIO Plugin
-        if: contains(fromJson('["refs/heads/main", "refs/heads/develop", "refs/tags"]'), github.ref)
+        if: contains(fromJson('["refs/heads/main", "refs/heads/develop", "refs/tags/v"]'), github.ref)
         uses: actions/upload-artifact@v3
         with:
-          name: DolbyIO_UnrealPlugin_${{ matrix.version }}_${{ env.BUILD_PLATFORM }}.zip
-          path: ./DolbyIO_UnrealPlugin_${{ matrix.version }}_${{ env.BUILD_PLATFORM }}.zip
+          name: DolbyIO_UnrealPlugin_${{ matrix.version }}_${{ env.BUILD_PLATFORM }}
+          path: ${{ env.UNREAL_PLUGIN_OUTPUT }}
           retention-days: ${{ env.RETENTION }}
-      - name: Create GitHub release
-        run: |
-          echo "Create GitHub release only for tag."
+
   build-windows:
     strategy:
       fail-fast: false
@@ -62,7 +55,7 @@ jobs:
       BUILD_PLATFORM: 'windows64'
     steps:
       - name: Code checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Download C++ SDK release asset
         id: download_cpp
         uses: ./.github/actions/download_cpp/powershell
@@ -75,18 +68,10 @@ jobs:
           Write-Output "UE_${{ matrix.version }}"
           $UERunUAT = "C:\\Program Files\\Epic Games\\UE_${{ matrix.version }}\\Engine\\Build\\BatchFiles\\RunUAT.bat"
           & $UERunUAT BuildPlugin -Rocket -Plugin="$(pwd)\\DolbyIO\\DolbyIO.uplugin" -TargetPlatforms=Win64 -Package="$(pwd)\\Build\\DolbyIO" -StrictIncludes -VS2019
-      - name: Zipping DolbyIO Plugin
-        uses: ./.github/actions/zip_artifact/powershell
-        with:
-          zip_name: "DolbyIO_UnrealPlugin_${{ matrix.version }}_${{ env.BUILD_PLATFORM }}.zip"
-          src_dir_path: ${{ env.UNREAL_PLUGIN_OUTPUT }}
       - name: Archive DolbyIO Plugin
-        if: contains(fromJson('["refs/heads/main", "refs/heads/develop", "refs/tags"]'), github.ref)
+        if: contains(fromJson('["refs/heads/main", "refs/heads/develop", "refs/tags/v"]'), github.ref)
         uses: actions/upload-artifact@v3
         with:
-          name: DolbyIO_UnrealPlugin_${{ matrix.version }}_${{ env.BUILD_PLATFORM }}.zip
-          path: ./DolbyIO_UnrealPlugin_${{ matrix.version }}_${{ env.BUILD_PLATFORM }}.zip
+          name: DolbyIO_UnrealPlugin_${{ matrix.version }}_${{ env.BUILD_PLATFORM }}
+          path: ${{ env.UNREAL_PLUGIN_OUTPUT }}
           retention-days: ${{ env.RETENTION }}
-      - name: Create GitHub release
-        run: |
-          Write-Output "Create GitHub release only for tag."