From ab2d7b42915f0bdf34590fd721c32af4bd5d1087 Mon Sep 17 00:00:00 2001
From: Christophe <christophe@lunarg.com>
Date: Tue, 5 Mar 2024 15:53:12 +0100
Subject: [PATCH] Release: Light releases are 'normal' release packages

---
 .github/workflows/make_light_release.yml | 16 ++++-----
 .github/workflows/make_release.yml       | 42 ------------------------
 2 files changed, 8 insertions(+), 50 deletions(-)
 delete mode 100644 .github/workflows/make_release.yml

diff --git a/.github/workflows/make_light_release.yml b/.github/workflows/make_light_release.yml
index 78ebd1fb5..d4643a50b 100644
--- a/.github/workflows/make_light_release.yml
+++ b/.github/workflows/make_light_release.yml
@@ -20,23 +20,23 @@ jobs:
     - name: Set env
       run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
       
-    - name: Prepare layout
-      run: mv copying.txt glm
+#    - name: Prepare layout
+#      run: mv copying.txt glm
       
     - name: Create zip archive
-      run: zip -r glm-${{ env.RELEASE_VERSION }}-light.zip glm
+      run: zip -r glm-${{ env.RELEASE_VERSION }}.zip .
       
     - name: Create 7z archive
-      run: 7z a glm-${{ env.RELEASE_VERSION }}-light.7z glm
+      run: 7z a glm-${{ env.RELEASE_VERSION }}.7z .
       
     - uses: actions/upload-artifact@v3
       with:
-        name: glm-${{ env.RELEASE_VERSION }}-light
-        path: glm-${{ env.RELEASE_VERSION }}-light.*
+        name: glm-${{ env.RELEASE_VERSION }}
+        path: glm-${{ env.RELEASE_VERSION }}.*
         
     - name: Add to Release
       uses: softprops/action-gh-release@v1
       with:
         files: |
-          glm-${{ env.RELEASE_VERSION }}-light.zip
-          glm-${{ env.RELEASE_VERSION }}-light.7z
+          glm-${{ env.RELEASE_VERSION }}.zip
+          glm-${{ env.RELEASE_VERSION }}.7z
diff --git a/.github/workflows/make_release.yml b/.github/workflows/make_release.yml
deleted file mode 100644
index c61bcb4d3..000000000
--- a/.github/workflows/make_release.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-# A workflow that creates a minimal archive with only the glm/ headers and copying.txt.
-
-name: Make release
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  make_zip:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Install dependencies
-      run: sudo apt-get update -y && sudo apt-get install -y zip p7zip
-      
-    - name: Check out repository code
-      uses: actions/checkout@v3
-      
-    - name: Set env
-      run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-      
-    - name: Prepare layout
-      run: mv copying.txt glm
-      
-    - name: Create zip archive
-      run: zip -r glm-${{ env.RELEASE_VERSION }}.zip .
-      
-    - name: Create 7z archive
-      run: 7z a glm-${{ env.RELEASE_VERSION }}.7z .
-      
-    - uses: actions/upload-artifact@v3
-      with:
-        name: glm-${{ env.RELEASE_VERSION }}
-        path: glm-${{ env.RELEASE_VERSION }}.*
-        
-    - name: Add to Release
-      uses: softprops/action-gh-release@v1
-      with:
-        files: |
-          glm-${{ env.RELEASE_VERSION }}.zip
-          glm-${{ env.RELEASE_VERSION }}.7z