From ae88e92361b686de112f8496d508b2b35c67792d Mon Sep 17 00:00:00 2001 From: MASES Public Developers Team <94312179+masesdevelopers@users.noreply.github.com> Date: Tue, 24 Sep 2024 03:56:50 +0200 Subject: [PATCH] Compilation fix (#94) * Compilation fix * Fix Docker build * Attestation fix --- .github/workflows/build.yaml | 8 ++++---- .github/workflows/docker.yaml | 4 ++-- .gitmodules | 2 +- {3dparty => src/3dparty}/JNet | 0 src/container/Dockerfile.linux | 6 +++--- src/container/DockerfileSDK.linux | 6 +++--- .../java/org/mases/jnet/developed/JNetEventResult.java | 2 +- .../main/java/org/mases/jnet/developed/JNetHelper.java | 2 +- .../netdroid/src/main/java/org/mases/jnet/developed/java | 2 +- src/net/Netdroid/DevelopedJNet | 2 +- src/net/Netdroid/JNetCoreBase.cs | 2 +- src/net/Netdroid/SpecificJNet | 2 +- .../NetdroidCLI/{JNetCLICore.cs => NetdroidCLICore.cs} | 2 +- src/net/NetdroidCLI/Program.cs | 4 ++-- 14 files changed, 22 insertions(+), 22 deletions(-) rename {3dparty => src/3dparty}/JNet (100%) rename src/net/NetdroidCLI/{JNetCLICore.cs => NetdroidCLICore.cs} (98%) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 38cc67262..2271a8139 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -140,7 +140,7 @@ jobs: uses: actions/attest-build-provenance@v1 id: attest with: - subject-name: ghcr.io/${{ github.repository_owner }}/jnet + subject-name: ghcr.io/${{ github.repository_owner }}/netdroid_sdk subject-digest: ${{ steps.push.outputs.digest }} push-to-registry: true @@ -223,12 +223,12 @@ jobs: uses: actions/attest-build-provenance@v1 id: attest with: - subject-name: ghcr.io/${{ github.repository_owner }}/jnet + subject-name: ghcr.io/${{ github.repository_owner }}/netdroid subject-digest: ${{ steps.push.outputs.digest }} push-to-registry: true - # Now run "build_windows" - build_windows: + # Now run "build_project" + build_project: needs: check_changes if: "always() && needs.check_changes.outputs.run_build_windows == 'true'" # The type of runner that the job will run on diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 6e0e5928b..599aeb37f 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -95,7 +95,7 @@ jobs: uses: actions/attest-build-provenance@v1 id: attest with: - subject-name: ghcr.io/${{ github.repository_owner }}/jnet + subject-name: ghcr.io/${{ github.repository_owner }}/netdroid subject-digest: ${{ steps.push.outputs.digest }} push-to-registry: true @@ -176,6 +176,6 @@ jobs: uses: actions/attest-build-provenance@v1 id: attest with: - subject-name: ghcr.io/${{ github.repository_owner }}/jnet + subject-name: ghcr.io/${{ github.repository_owner }}/netdroid_sdk subject-digest: ${{ steps.push.outputs.digest }} push-to-registry: true \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index f4eb0a139..472f72d1d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "3dparty/JNet"] - path = 3dparty/JNet + path = src/3dparty/JNet url = https://github.com/masesgroup/JNet diff --git a/3dparty/JNet b/src/3dparty/JNet similarity index 100% rename from 3dparty/JNet rename to src/3dparty/JNet diff --git a/src/container/Dockerfile.linux b/src/container/Dockerfile.linux index f6b20e8cf..7d1a39ac4 100644 --- a/src/container/Dockerfile.linux +++ b/src/container/Dockerfile.linux @@ -3,12 +3,12 @@ ARG TARGETARCH WORKDIR /app # Copy everything -COPY ./src/net ./ +COPY ./src ./ ENV NETDROID_DOCKER_BUILD_ACTIONS=true # Restore as distinct layers -RUN dotnet restore Netdroid.sln -a $TARGETARCH +RUN dotnet restore ./net/Netdroid.sln -a $TARGETARCH # Build and publish a release -RUN dotnet publish ./NetdroidCLI/NetdroidCLI.csproj --self-contained -p:PublishReadyToRun=true --framework net8.0 -c Release -o out -a $TARGETARCH +RUN dotnet publish ./net/NetdroidCLI/NetdroidCLI.csproj --self-contained -p:PublishReadyToRun=true --framework net8.0 -c Release -o out -a $TARGETARCH # Build runtime image FROM ubuntu:22.04 diff --git a/src/container/DockerfileSDK.linux b/src/container/DockerfileSDK.linux index 6482435f6..f7beea544 100644 --- a/src/container/DockerfileSDK.linux +++ b/src/container/DockerfileSDK.linux @@ -3,12 +3,12 @@ ARG TARGETARCH WORKDIR /app # Copy everything -COPY ./src/net ./ +COPY ./src ./ ENV NETDROID_DOCKER_BUILD_ACTIONS=true # Restore as distinct layers -RUN dotnet restore Netdroid.sln -a $TARGETARCH +RUN dotnet restore ./net/Netdroid.sln -a $TARGETARCH # Build and publish a release -RUN dotnet publish ./NetdroidCLI/NetdroidCLI.csproj --self-contained -p:PublishReadyToRun=true --framework net8.0 -c Release -o out -a $TARGETARCH +RUN dotnet publish ./net/NetdroidCLI/NetdroidCLI.csproj --self-contained -p:PublishReadyToRun=true --framework net8.0 -c Release -o out -a $TARGETARCH # Build runtime image FROM ubuntu:22.04 diff --git a/src/jvm/netdroid/src/main/java/org/mases/jnet/developed/JNetEventResult.java b/src/jvm/netdroid/src/main/java/org/mases/jnet/developed/JNetEventResult.java index 1bacbcfa0..4bfcb1fcf 120000 --- a/src/jvm/netdroid/src/main/java/org/mases/jnet/developed/JNetEventResult.java +++ b/src/jvm/netdroid/src/main/java/org/mases/jnet/developed/JNetEventResult.java @@ -1 +1 @@ -../../../../../../../../../../3dparty/JNet/src/jvm/jnet/src/main/java/org/mases/jnet/developed/JNetEventResult.java \ No newline at end of file +../../../../../../../../../3dparty/JNet/src/jvm/jnet/src/main/java/org/mases/jnet/developed/JNetEventResult.java \ No newline at end of file diff --git a/src/jvm/netdroid/src/main/java/org/mases/jnet/developed/JNetHelper.java b/src/jvm/netdroid/src/main/java/org/mases/jnet/developed/JNetHelper.java index 6bb47b321..3dc19f08c 120000 --- a/src/jvm/netdroid/src/main/java/org/mases/jnet/developed/JNetHelper.java +++ b/src/jvm/netdroid/src/main/java/org/mases/jnet/developed/JNetHelper.java @@ -1 +1 @@ -../../../../../../../../../../3dparty/JNet/src/jvm/jnet/src/main/java/org/mases/jnet/developed/JNetHelper.java \ No newline at end of file +../../../../../../../../../3dparty/JNet/src/jvm/jnet/src/main/java/org/mases/jnet/developed/JNetHelper.java \ No newline at end of file diff --git a/src/jvm/netdroid/src/main/java/org/mases/jnet/developed/java b/src/jvm/netdroid/src/main/java/org/mases/jnet/developed/java index eb6221d0a..ab719fae0 120000 --- a/src/jvm/netdroid/src/main/java/org/mases/jnet/developed/java +++ b/src/jvm/netdroid/src/main/java/org/mases/jnet/developed/java @@ -1 +1 @@ -../../../../../../../../../../3dparty/JNet/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java \ No newline at end of file +../../../../../../../../../3dparty/JNet/src/jvm/jnet/src/main/java/org/mases/jnet/developed/java \ No newline at end of file diff --git a/src/net/Netdroid/DevelopedJNet b/src/net/Netdroid/DevelopedJNet index 8f17685bf..030390c5b 120000 --- a/src/net/Netdroid/DevelopedJNet +++ b/src/net/Netdroid/DevelopedJNet @@ -1 +1 @@ -../../../3dparty/JNet/src/net/JNet/Developed \ No newline at end of file +../../3dparty/JNet/src/net/JNet/Developed \ No newline at end of file diff --git a/src/net/Netdroid/JNetCoreBase.cs b/src/net/Netdroid/JNetCoreBase.cs index 640fe0151..0f6e079e0 120000 --- a/src/net/Netdroid/JNetCoreBase.cs +++ b/src/net/Netdroid/JNetCoreBase.cs @@ -1 +1 @@ -../../../3dparty/JNet/src/net/JNet/JNetCoreBase.cs \ No newline at end of file +../../3dparty/JNet/src/net/JNet/JNetCoreBase.cs \ No newline at end of file diff --git a/src/net/Netdroid/SpecificJNet b/src/net/Netdroid/SpecificJNet index 4a6c6af33..74c5e2a61 120000 --- a/src/net/Netdroid/SpecificJNet +++ b/src/net/Netdroid/SpecificJNet @@ -1 +1 @@ -../../../3dparty/JNet/src/net/JNet/Specific \ No newline at end of file +../../3dparty/JNet/src/net/JNet/Specific \ No newline at end of file diff --git a/src/net/NetdroidCLI/JNetCLICore.cs b/src/net/NetdroidCLI/NetdroidCLICore.cs similarity index 98% rename from src/net/NetdroidCLI/JNetCLICore.cs rename to src/net/NetdroidCLI/NetdroidCLICore.cs index 9ed6b3a3d..5c8769bb6 100644 --- a/src/net/NetdroidCLI/JNetCLICore.cs +++ b/src/net/NetdroidCLI/NetdroidCLICore.cs @@ -134,7 +134,7 @@ protected override string[] ProcessCommandLine() List namespaceList = new List(); - var netdroidAssembly = typeof(NetdroidCoreBase<>).Assembly; + var netdroidAssembly = typeof(NetdroidCore<>).Assembly; foreach (var item in netdroidAssembly.GetExportedTypes()) { if (item.IsPublic) diff --git a/src/net/NetdroidCLI/Program.cs b/src/net/NetdroidCLI/Program.cs index 065b4a102..0e211ff52 100644 --- a/src/net/NetdroidCLI/Program.cs +++ b/src/net/NetdroidCLI/Program.cs @@ -38,7 +38,7 @@ static async Task Main(string[] args) if (NetdroidCLICore.Interactive) { - ScriptOptions options = ScriptOptions.Default.WithReferences(typeof(NetdroidCoreBase<>).Assembly) + ScriptOptions options = ScriptOptions.Default.WithReferences(typeof(NetdroidCore<>).Assembly) .WithImports(NetdroidCLICore.NamespaceList); ScriptState state = null; while (true) @@ -85,7 +85,7 @@ static async Task Main(string[] args) var scriptCode = File.ReadAllText(NetdroidCLICore.Script); - ScriptOptions options = ScriptOptions.Default.WithReferences(typeof(NetdroidCoreBase<>).Assembly) + ScriptOptions options = ScriptOptions.Default.WithReferences(typeof(NetdroidCore<>).Assembly) .WithImports(NetdroidCLICore.NamespaceList); var script = CSharpScript.Create(scriptCode, options);