Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 07:47:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into 0000.00.GitHub_Actions_Release_builds

Browse source
This commit is contained in:
Julian Groß 2024-06-15 22:00:02 +02:00 committed by GitHub
commit 3006699488
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/linux_server_build.yml vendored
View file

@ -238,7 +238,7 @@ jobs:
fi fi
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
submodules: false submodules: false
fetch-depth: 1 fetch-depth: 1
@ -305,7 +305,7 @@ jobs:
df -h df -h
- name: Upload artifact to GitHub - name: Upload artifact to GitHub
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: ${{ env.ARTIFACT_PATTERN }} name: ${{ env.ARTIFACT_PATTERN }}
path: pkg-scripts/${{ env.ARTIFACT_PATTERN }} path: pkg-scripts/${{ env.ARTIFACT_PATTERN }}

2
.github/workflows/master_build.yml vendored
View file

@ -122,7 +122,7 @@ jobs:
rm -rf ~/overte-files rm -rf ~/overte-files
rm -rf ~/.cache rm -rf ~/.cache
- uses: actions/checkout@v1 - uses: actions/checkout@v4
with: with:
submodules: false submodules: false
fetch-depth: 1 fetch-depth: 1

4
.github/workflows/master_deploy_apidocs.yml vendored
View file

@ -1,4 +1,4 @@
# Copyright 2022-2023 Overte e.V. # Copyright 2022-2024 Overte e.V.
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
name: Master API-docs CI Build and Deploy name: Master API-docs CI Build and Deploy
@ -14,7 +14,7 @@ jobs:
name: Build and deploy API-docs name: Build and deploy API-docs
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Install dependencies - name: Install dependencies
working-directory: tools/jsdoc working-directory: tools/jsdoc

4
.github/workflows/master_deploy_doxygen.yml vendored
View file

@ -1,4 +1,4 @@
# Copyright 2022-2023 Overte e.V. # Copyright 2022-2024 Overte e.V.
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
name: Master Doxygen CI Build and Deploy name: Master Doxygen CI Build and Deploy
@ -14,7 +14,7 @@ jobs:
name: Build and deploy Doxygen documentation name: Build and deploy Doxygen documentation
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Install dependencies - name: Install dependencies
run: | run: |

4
.github/workflows/pr_build.yml vendored
View file

@ -172,7 +172,7 @@ jobs:
rm -rf ~/overte-files rm -rf ~/overte-files
rm -rf ~/.cache rm -rf ~/.cache
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
submodules: false submodules: false
fetch-depth: 1 fetch-depth: 1
@ -342,7 +342,7 @@ jobs:
- name: Upload Artifact - name: Upload Artifact
if: startsWith(matrix.os, 'Windows') || startsWith(matrix.os, 'macOS') if: startsWith(matrix.os, 'Windows') || startsWith(matrix.os, 'macOS')
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: ${{ env.ARTIFACT_PATTERN }} name: ${{ env.ARTIFACT_PATTERN }}
path: ./build/${{ env.ARTIFACT_PATTERN }} path: ./build/${{ env.ARTIFACT_PATTERN }}

8
hifi_qt.py
View file

@ -170,9 +170,7 @@ endif()
if distro.id() == 'ubuntu': if distro.id() == 'ubuntu':
u_major = int( distro.major_version() ) u_major = int( distro.major_version() )
if u_major == 18: if u_major == 20:
self.qtUrl = 'http://motofckr9k.ddns.net/vircadia_packages/qt5-install-5.15.2-ubuntu-18.04-aarch64_test.tar.xz'
elif u_major == 20:
self.qtUrl = self.assets_url + '/dependencies/qt5/qt5-install-5.15.9-2023.05.21-kde_fb3ec282151b1ee281a24f0545a40ac6438537c2-ubuntu-20.04-aarch64.tar.xz' self.qtUrl = self.assets_url + '/dependencies/qt5/qt5-install-5.15.9-2023.05.21-kde_fb3ec282151b1ee281a24f0545a40ac6438537c2-ubuntu-20.04-aarch64.tar.xz'
elif u_major > 20: elif u_major > 20:
self.__no_qt_package_error() self.__no_qt_package_error()
@ -182,9 +180,7 @@ endif()
elif distro.id() == 'debian': elif distro.id() == 'debian':
u_major = int( distro.major_version() ) u_major = int( distro.major_version() )
if u_major == 10: if u_major > 10:
self.qtUrl = 'https://data.moto9000.moe/vircadia_packages/qt5-install-5.15.2-debian-10-aarch64.tar.xz'
elif u_major > 10:
self.__no_qt_package_error() self.__no_qt_package_error()
else: else:
self.__unsupported_error() self.__unsupported_error()

2
scripts/defaultScripts.js
View file

@ -47,7 +47,7 @@ var DEFAULT_SCRIPTS_SEPARATE = [
"communityScripts/notificationCore/notificationCore.js", "communityScripts/notificationCore/notificationCore.js",
"simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js", "simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js",
{"stable": "system/more/app-more.js", "beta": "https://more.overte.org/more/app-more.js"}, {"stable": "system/more/app-more.js", "beta": "https://more.overte.org/more/app-more.js"},
{"stable": "communityScripts/chat/FloofChat.js", "beta": "https://content.fluffy.ws/scripts/chat/FloofChat.js"} "communityScripts/chat/FloofChat.js",
//"system/chat.js" //"system/chat.js"
]; ];

2
tools/nitpick/AppDataHighFidelity/Interface.json
View file

@ -38,7 +38,7 @@
"Avatar/animGraphURL": "", "Avatar/animGraphURL": "",
"Avatar/attachmentData/size": 0, "Avatar/attachmentData/size": 0,
"Avatar/avatarEntityData/size": 0, "Avatar/avatarEntityData/size": 0,
"Avatar/collisionSoundURL": "https://cdn-1.vircadia.com/eu-c-1/vircadia-public/sounds/Collisions-otherorganic/Body_Hits_Impact.wav", "Avatar/collisionSoundURL": "",
"Avatar/displayName": "", "Avatar/displayName": "",
"Avatar/dominantHand": "right", "Avatar/dominantHand": "right",
"Avatar/flyingHMD": false, "Avatar/flyingHMD": false,