Skip to content

Commit

Permalink
Fix dist filename
Browse files Browse the repository at this point in the history
  • Loading branch information
Daylily-Zeleen committed Jul 29, 2023
1 parent 60e2b85 commit 1ce5530
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/actions/upload/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ runs:
with:
name: Godot Universal Serializer 2
path: |
${{ github.workspace }}/dist/addons/com.daylily_zeleen.godot_universal_serializer/libgus2.${{ input.artifact_file_suffix }}
${{ github.workspace }}/dist/addons/com.daylily_zeleen.godot_universal_serializer/bin/libgus2.${{ inputs.artifact_file_suffix }}
retention-days: 14
2 changes: 1 addition & 1 deletion .github/workflows/android_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
matrix:
target: [template_debug, template_release]
arch: [arm64, x86_64]
shlibsuffix: "so"
shlibsuffix: ["so"]

steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
matrix:
target: [template_debug, template_release]
arch: [arm64]
shlibsuffix: "dylib"
shlibsuffix: ["dylib"]

steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
matrix:
target: [template_debug, template_release]
arch: [x86_64]
shlibsuffix: "so"
shlibsuffix: ["so"]

steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
matrix:
target: [template_debug, template_release]
arch: [universal]
shlibsuffix: "framework"
shlibsuffix: ["framework"]

steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,14 @@ sources = Glob("src/*.cpp")
# env["CXXFLAGS"] = ["-std=c++2a"]


bin_dir = "demo/addons/com.daylily_zeleen.godot_universal_serializer2/bin/"
bin_dir = "dist/addons/com.daylily_zeleen.godot_universal_serializer2/bin/"

if env["platform"] == "macos":
library = env.SharedLibrary(
bin_dir
+ "libgus2.{}.{}.framework/libgus.{}.{}".format(env["platform"], env["target"], env["platform"], env["target"]),
+ "libgus2.{}.{}.framework/libguss.{}.{}".format(
env["platform"], env["target"], env["platform"], env["target"]
),
source=sources,
)
else:
Expand Down
2 changes: 1 addition & 1 deletion build.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def main():
if arg.startswith("target"):
debug_and_relaese = False

bin_dir = "demo/addons/com.daylily_zeleen.godot_universal_serializer2/bin/"
bin_dir = "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))
Expand Down

0 comments on commit 1ce5530

Please sign in to comment.