Fixed Linux/MacOS ARM build artifact not being uploaded to our host a…

…nd Coverity build
Sphereserver · Aug 7, 2024 · 7a9a90c · 7a9a90c
1 parent e0e388d
commit 7a9a90c
Show file tree

Hide file tree

Showing 9 changed files with 72 additions and 18 deletions.
diff --git a/.github/workflows/build_aux_files.yml b/.github/workflows/build_aux_files.yml
@@ -1,12 +1,16 @@
 name: Create/upload auxiliary files to the release.
 
 on:
-  - push
+  push:
+    branches:
+      - 'master'
+      - 'main'
+      - 'dev'
 
 jobs:
   upload_github_release:
     # Upload artifact linked to GitHub RELEASE we are creating - only if the run is for a pull request, or for selected branches
-    if: contains(fromJson('["master", "main"]'), github.ref_name)
+    #if: contains(fromJson('["master", "main"]'), github.ref_name)
 
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/build_linux_x86.yml b/.github/workflows/build_linux_x86.yml
@@ -1,8 +1,16 @@
 name: Linux x86
 
 on:
-  - push
-  - pull_request
+  push:
+    branches:
+      - 'master'
+      - 'main'
+      - 'dev'
+  pull_request:
+    branches:
+      - 'master'
+      - 'main'
+      - 'dev'
 
 jobs:
   linux-x86:
@@ -135,4 +143,4 @@ jobs:
           run-id: ${{ github.run_id }}
       - name: Push release
         run: |
-          curl -sST "{SphereSvrX-linux-x86-nightly.zip}" -u ${{secrets.UP_USER}}:${{secrets.UP_PASS}} ${{secrets.UP_WHERE}}
+          curl -sST "{SphereSvrX-linux-x86-nightly.tar.gz}" -u ${{secrets.UP_USER}}:${{secrets.UP_PASS}} ${{secrets.UP_WHERE}}
diff --git a/.github/workflows/build_linux_x86_64.yml b/.github/workflows/build_linux_x86_64.yml
@@ -1,8 +1,16 @@
 name: Linux x86_64
 
 on:
-  - push
-  - pull_request
+  push:
+    branches:
+      - 'master'
+      - 'main'
+      - 'dev'
+  pull_request:
+    branches:
+      - 'master'
+      - 'main'
+      - 'dev'
 
 jobs:
   linux-x86_64:
@@ -87,4 +95,4 @@ jobs:
           run-id: ${{ github.run_id }}
       - name: Push release
         run: |
-          curl -sST "{SphereSvrX-linux-x86_64-nightly.zip}" -u ${{secrets.UP_USER}}:${{secrets.UP_PASS}} ${{secrets.UP_WHERE}}
+          curl -sST "{SphereSvrX-linux-x86_64-nightly.tar.gz}" -u ${{secrets.UP_USER}}:${{secrets.UP_PASS}} ${{secrets.UP_WHERE}}
diff --git a/.github/workflows/build_osx_arm.yml b/.github/workflows/build_osx_arm.yml
@@ -1,8 +1,16 @@
 name: MacOS ARM
 
 on:
-  - push
-  - pull_request
+  push:
+    branches:
+      - 'master'
+      - 'main'
+      - 'dev'
+  pull_request:
+    branches:
+      - 'master'
+      - 'main'
+      - 'dev'
 
 jobs:
   macos-arm64:
@@ -89,7 +97,7 @@ jobs:
       - name: Download builds
         uses: actions/download-artifact@v4
         with:
-          name: Build-arm64
+          name: Build-osx-arm64
           merge-multiple: true
           run-id: ${{ github.run_id }}
       - name: Push release

diff --git a/.github/workflows/build_osx_x86_64.yml b/.github/workflows/build_osx_x86_64.yml
@@ -1,8 +1,16 @@
 name: MacOS x86_64
 
 on:
-  - push
-  - pull_request
+  push:
+    branches:
+      - 'master'
+      - 'main'
+      - 'dev'
+  pull_request:
+    branches:
+      - 'master'
+      - 'main'
+      - 'dev'
 
 jobs:
   macos-x86_64:

diff --git a/.github/workflows/build_win_x86.yml b/.github/workflows/build_win_x86.yml
@@ -1,8 +1,16 @@
 name: Windows x86
 
 on:
-  - push
-  - pull_request
+  push:
+    branches:
+      - 'master'
+      - 'main'
+      - 'dev'
+  pull_request:
+    branches:
+      - 'master'
+      - 'main'
+      - 'dev'
 
 jobs:
   windows-x86:

diff --git a/.github/workflows/build_win_x86_64.yml b/.github/workflows/build_win_x86_64.yml
@@ -1,8 +1,16 @@
 name: Windows x86_64
 
 on:
-  - push
-  - pull_request
+  push:
+    branches:
+      - 'master'
+      - 'main'
+      - 'dev'
+  pull_request:
+    branches:
+      - 'master'
+      - 'main'
+      - 'dev'
 
 jobs:
   windows-x86_64:

diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml
@@ -70,6 +70,7 @@ jobs:
         - name: Submit the result to Coverity Scan
           run: |
                 pwd
+                cd build
                 tar czvf build-data.tgz cov-int
                 curl \
                     --form project=SphereServer/Source-X \

diff --git a/src/common/sphere_library/CSObjCont.cpp b/src/common/sphere_library/CSObjCont.cpp
@@ -32,7 +32,8 @@ CSObjCont::CSObjCont() :
 
 CSObjCont::~CSObjCont()
 {
-	ClearContainer(true);
+    // Do not virtually call this method, since i'm in the destructor of the base-most class.
+	CSObjCont::ClearContainer(true);
 }
 
 // CSObjCont:: Modifiers.