Fix upload artfacts.

Daylily-Zeleen · Jul 30, 2023 · 68d004a · 68d004a
1 parent 667c06d
commit 68d004a
Show file tree

Hide file tree

Showing 12 changed files with 82 additions and 17 deletions.
diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
@@ -38,11 +38,11 @@ runs:
         SCONS_CACHE: .scons-cache
         SCONS_CACHE_DIR: .scons-cache
       run: |
-        cd godot-cpp && scons target=${{ inputs.target }} platform=${{ inputs.platform }} arch=${{ inputs.arch }} generate_bindings=yes ${{ inputs.sconsflags }}
+        cd godot-cpp && scons target=${{ inputs.target }} platform=${{ inputs.platform }} arch=${{ inputs.arch }} generate_bindings=yes ${{ inputs.sconsflags }} optimize=speed
     - name: Build Godot Universal Serializer 2
       shell: sh
       env:
         SCONS_CACHE: .scons-cache
         SCONS_CACHE_DIR: .scons-cache
       run: |
-        scons target=${{ inputs.target }} platform=${{ inputs.platform }} arch=${{ inputs.arch }} generate_bindings=no ${{ inputs.sconsflags }}
+        scons target=${{ inputs.target }} platform=${{ inputs.platform }} arch=${{ inputs.arch }} generate_bindings=no ${{ inputs.sconsflags }} optimize=speed
diff --git a/.github/actions/upload/action.yml b/.github/actions/upload/action.yml
@@ -4,10 +4,16 @@ description: Upload Godot Cpp and the Godot Universal Serializer 2 Extension.
 runs:
   using: composite
   steps:
+      - name: Copy dynamic library to dist dir.
+      shell: sh
+      if: ${{ inputs.platform != 'macos' }}
+      run: |
+        cp -r bin/libgus2.${{ inputs.artifact_file_suffix }} dist/addons/com.daylily_zeleen.godot_universal_serializer2/bin/libgus2.${{ inputs.artifact_file_suffix }}
+
     - name: Upload Artifact
       uses: actions/upload-artifact@v3
       with:
         name: Godot Universal Serializer 2
         path: |
-          ${{ github.workspace }}/dist/addons/com.daylily_zeleen.godot_universal_serializer2/bin/libgus2.${{ inputs.artifact_file_suffix }}
+          ${{ github.workspace }}/dist/**
         retention-days: 14
diff --git a/.github/workflows/android_builds.yml b/.github/workflows/android_builds.yml
@@ -15,7 +15,7 @@ jobs:
       matrix:
         target: [template_debug, template_release]
         arch: [arm64, x86_64]
-        shlibsuffix: ["so"]
+        shlibsuffix: [so]
 
     steps:
       - uses: actions/checkout@v3
@@ -38,4 +38,5 @@ jobs:
       - name: Upload ${{ matrix.target }} ${{ matrix.arch }}
         uses: ./.github/actions/upload
         with:
+          platform: android
           artifact_file_suffix: android.${{ matrix.target }}.${{ matrix.arch }}.${{ matrix.shlibsuffix }}
diff --git a/.github/workflows/ios_builds.yml b/.github/workflows/ios_builds.yml
@@ -15,7 +15,7 @@ jobs:
       matrix:
         target: [template_debug, template_release]
         arch: [arm64]
-        shlibsuffix: ["dylib"]
+        shlibsuffix: [dylib]
 
     steps:
       - uses: actions/checkout@v3
@@ -32,4 +32,5 @@ jobs:
       - name: Upload ${{ matrix.target }} ${{ matrix.arch }}
         uses: ./.github/actions/upload
         with:
+          platform: ios
           artifact_file_suffix: ios.${{ matrix.target }}.${{ matrix.arch }}.${{ matrix.shlibsuffix }}
diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
@@ -14,8 +14,8 @@ jobs:
       fail-fast: false
       matrix:
         target: [template_debug, template_release]
-        arch: [x86_64]
-        shlibsuffix: ["so"]
+        arch: [x86_64, arm64, rv64 ]
+        shlibsuffix: [so]
 
     steps:
       - uses: actions/checkout@v3
@@ -33,5 +33,6 @@ jobs:
       - name: Upload ${{ matrix.target }} ${{ matrix.arch }}
         uses: ./.github/actions/upload
         with:
+          platform: linux
           artifact_file_suffix: linux.${{ matrix.target }}.${{ matrix.arch }}.${{ matrix.shlibsuffix }}
 
diff --git a/.github/workflows/macos_builds.yml b/.github/workflows/macos_builds.yml
@@ -16,7 +16,7 @@ jobs:
       matrix:
         target: [template_debug, template_release]
         arch: [universal]
-        shlibsuffix: ["framework"]
+        shlibsuffix: [dylib]
 
     steps:
       - uses: actions/checkout@v3
@@ -40,10 +40,11 @@ jobs:
           APPLE_DEV_TEAM_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_TEAM_ID }}
           APPLE_DEV_PASSWORD: ${{ secrets.PROD_MACOS_NOTARIZATION_PWD }}
           APPLE_DEV_APP_ID: ${{ secrets.PROD_MACOS_APPLE_DEV_APP_ID }}
-        run: ./misc/ci-sign-macos.ps1 dist/addons/com.daylily_zeleen.godot_universal_serializer2/bin/libgus2.macos.${{ matrix.target }}.framework
+        run: ./misc/ci-sign-macos.ps1 dist/addons/com.daylily_zeleen.godot_universal_serializer2/libgus2.macos.${{ matrix.target }}.framework
         if: ${{ env.APPLE_DEV_ID }}
 
       - name: Upload ${{ matrix.target }} ${{ matrix.arch }}
         uses: ./.github/actions/upload
         with:
-          artifact_file_suffix: macos.${{ matrix.target }}.${{ matrix.arch }}.${{ matrix.shlibsuffix }}
+          platform: macos
+          artifact_file_suffix: macos.${{ matrix.target }}.${{ matrix.arch }}.${{ matrix.shlibsuffix }}/
diff --git a/.github/workflows/web_builds.yml b/.github/workflows/web_builds.yml
@@ -44,5 +44,6 @@ jobs:
       - name: Upload ${{ matrix.target }} ${{ matrix.arch }}
         uses: ./.github/actions/upload
         with:
+          platform: javascript
           artifact_file_suffix: javascript.${{ matrix.target }}.${{ matrix.arch }}.${{ matrix.shlibsuffix }}
 
diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml
@@ -15,7 +15,7 @@ jobs:
       matrix:
         target: [template_debug, template_release]
         arch: [x86_32, x86_64]
-        shlibsuffix: ["dll"]
+        shlibsuffix: [dll]
 
     steps:
       - uses: actions/checkout@v3
@@ -35,4 +35,5 @@ jobs:
       - name: Upload ${{ matrix.target }} ${{ matrix.arch }}
         uses: ./.github/actions/upload
         with:
+          platform: windows
           artifact_file_suffix: windows.${{ matrix.target }}.${{ matrix.arch }}.${{ matrix.shlibsuffix }}
diff --git a/SConstruct b/SConstruct
@@ -32,19 +32,16 @@ sources = Glob("src/*.cpp")
 #         env["CXXFLAGS"] = ["-std=c++2a"]
 
 
-bin_dir = "dist/addons/com.daylily_zeleen.godot_universal_serializer2/bin/"
-
 if env["platform"] == "macos":
     library = env.SharedLibrary(
-        bin_dir
-        + "libgus2.{}.{}.framework/libguss.{}.{}".format(
+        "dist/addons/com.daylily_zeleen.godot_universal_serializer2/bin/libgus2.{}.{}.framework/libguss.{}.{}".format(
             env["platform"], env["target"], env["platform"], env["target"]
         ),
         source=sources,
     )
 else:
     library = env.SharedLibrary(
-        bin_dir + "libgus2{}{}".format(env["suffix"], env["SHLIBSUFFIX"]),
+        "bin/libgus2{}{}".format(env["suffix"], env["SHLIBSUFFIX"]),
         source=sources,
     )
 

diff --git a/build.py b/build.py
@@ -29,7 +29,7 @@ def main():
         if arg.startswith("target"):
             debug_and_relaese = False
 
-    bin_dir = "dist/addons/com.daylily_zeleen.godot_universal_serializer2/bin/"
+    bin_dir = "bin/" #"dist/addons/com.daylily_zeleen.godot_universal_serializer2/bin/"
     # Remove all last build files.
     for f in os.listdir(bin_dir):
         os.remove(path_join(bin_dir, f))

diff --git a/...dot_universal_serializer2/bin/libgus2.macos.template_debug.framework/Resources/Info.plist b/...dot_universal_serializer2/bin/libgus2.macos.template_debug.framework/Resources/Info.plist
@@ -0,0 +1,28 @@
+<?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">
+<dict>
+	<key>CFBundleExecutable</key>
+	<string>libgus2.macos.template_debug</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.godot-universal-serializer2.godot-universal-serializer2</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>Godot Box2D</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0.0</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+    <key>NSHumanReadableCopyright</key>
+	<string>Copyright (c) 2022-present Ricardo Buring and Dragos Daian.</string>
+	<key>CFBundleVersion</key>
+	<string>1.0.0</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.12</string>
+</dict>
+</plist>
diff --git a/...t_universal_serializer2/bin/libgus2.macos.template_release.framework/Resources/Info.plist b/...t_universal_serializer2/bin/libgus2.macos.template_release.framework/Resources/Info.plist
@@ -0,0 +1,28 @@
+<?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">
+<dict>
+	<key>CFBundleExecutable</key>
+	<string>libgus2.macos.template_release</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.godot-universal-serializer2.godot-universal-serializer2</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>Godot Box2D</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0.0</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+    <key>NSHumanReadableCopyright</key>
+	<string>Copyright (c) 2022-present Ricardo Buring and Dragos Daian.</string>
+	<key>CFBundleVersion</key>
+	<string>1.0.0</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.12</string>
+</dict>
+</plist>