Skip to content

Commit

Permalink
Merge branch 'master' into jme3-vr
Browse files Browse the repository at this point in the history
  • Loading branch information
jseinturier committed Mar 28, 2024
2 parents 541ca4a + 9452078 commit db449df
Show file tree
Hide file tree
Showing 2,016 changed files with 99,108 additions and 88,577 deletions.
1 change: 1 addition & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
open_collective: jmonkeyengine
93 changes: 0 additions & 93 deletions .github/actions/tools/bintray.sh

This file was deleted.

22 changes: 22 additions & 0 deletions .github/actions/tools/minio.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/bin/bash

# minio_uploadFile <LOCAL_FILEPATH> <REMOTE_FILEPATH> <MINIO_URL> <MINIO_ACCESS_KEY> <MINIO_SECRET_KEY>
#
# Upload the specified file to the specified MinIO instance.
function minio_uploadFile {
file="$1"
dest="$2"
url="$3"
access="$4"
secret="$5"

echo "Install MinIO client"
wget --quiet https://dl.min.io/client/mc/release/linux-amd64/mc
chmod +x ./mc

echo "Add an alias for the MinIO instance to the MinIO configuration file"
./mc alias set objects "$url" "$access" "$secret"

echo "Upload $file to $url/$dest"
./mc cp "$file" "objects/$dest"
}
31 changes: 1 addition & 30 deletions .github/actions/tools/uploadToMaven.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,10 @@
#############################################
#
# Usage
# uploadAllToMaven path/of/dist/maven https://api.bintray.com/maven/riccardo/sandbox-maven/ riccardo $BINTRAY_PASSWORD gitrepo license
# Note: gitrepo and license are needed only when uploading to bintray if you want to create missing packages automatically
# gitrepo must be a valid source repository
# license must be a license supported by bintray eg "BSD 3-Clause"
# or
# uploadAllToMaven path/of/dist/maven $GITHUB_PACKAGE_REPOSITORY user password
# uploadAllToMaven path/of/dist/maven $GITHUB_PACKAGE_REPOSITORY user password
#
#############################################
root="`dirname ${BASH_SOURCE[0]}`"
source $root/bintray.sh

set -e
function uploadToMaven {
Expand All @@ -34,29 +28,6 @@ function uploadToMaven {
auth="-H \"Authorization: token $password\""
fi


if [[ $repourl == https\:\/\/api.bintray.com\/* ]];
then
package="`dirname $destfile`"
version="`basename $package`"
package="`dirname $package`"
package="`basename $package`"

if [ "$user" = "" -o "$password" = "" ];
then
echo "Error! You need username and password to upload to bintray"
exit 1
fi
echo "Detected bintray"

bintrayRepo="${repourl/https\:\/\/api.bintray.com\/maven/}"
echo "Create package on $bintrayRepo"

bintray_createPackage $bintrayRepo $package $user $password $srcrepo $license

repourl="$repourl/$package"
fi

cmd="curl -T \"$file\" $auth \
\"$repourl/$destfile\" \
-vvv"
Expand Down
21 changes: 21 additions & 0 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: auto-format
on:
push:

jobs:
format:
runs-on: ubuntu-latest
if: ${{ false }}
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Prettify code
uses: creyD/[email protected]
with:
prettier_options: --tab-width 4 --print-width 110 --write **/**/*.java
prettier_version: "2.8.8"
only_changed: True
commit_message: "auto-format"
prettier_plugins: "prettier-plugin-java"
Loading

0 comments on commit db449df

Please sign in to comment.