diff --git a/.github/workflows/CompileAndRelease.yml b/.github/workflows/BuildAndRelease.yml old mode 100755 new mode 100644 similarity index 99% rename from .github/workflows/CompileAndRelease.yml rename to .github/workflows/BuildAndRelease.yml index a563a0c2d..8625a31eb --- a/.github/workflows/CompileAndRelease.yml +++ b/.github/workflows/BuildAndRelease.yml @@ -1,9 +1,9 @@ -name: CompileAndRelease +name: BuildAndRelease on: #[push, pull_request] #just for test release scripts schedule: - - cron: '0 0 1 * *' #every first day of the month at midnight + - cron: '0 1 1 * *' #every first day of the month at 1am jobs: update_ml_version: diff --git a/.github/workflows/CompileMacOS.yml b/.github/workflows/BuildMacOS.yml old mode 100755 new mode 100644 similarity index 98% rename from .github/workflows/CompileMacOS.yml rename to .github/workflows/BuildMacOS.yml index edf71c2e9..b6d6f7da3 --- a/.github/workflows/CompileMacOS.yml +++ b/.github/workflows/BuildMacOS.yml @@ -1,4 +1,4 @@ -name: CompileMacOS +name: BuildMacOS on: [push, pull_request] diff --git a/.github/workflows/CompileUbuntu.yml b/.github/workflows/BuildUbuntu.yml old mode 100755 new mode 100644 similarity index 98% rename from .github/workflows/CompileUbuntu.yml rename to .github/workflows/BuildUbuntu.yml index eb2e05894..323eecae4 --- a/.github/workflows/CompileUbuntu.yml +++ b/.github/workflows/BuildUbuntu.yml @@ -1,4 +1,4 @@ -name: CompileUbuntu +name: BuildUbuntu on: [push, pull_request] @@ -109,7 +109,8 @@ jobs: run: | cmake src/ -G Ninja - name: Build MeshLab - run: ninja -C . + run: | + ninja -C . - name: Install Meshlab run: sudo ninja -C . install diff --git a/.github/workflows/CompileWindows.yml b/.github/workflows/BuildWindows.yml similarity index 99% rename from .github/workflows/CompileWindows.yml rename to .github/workflows/BuildWindows.yml index 7c0d8a36a..1a5cee60e 100644 --- a/.github/workflows/CompileWindows.yml +++ b/.github/workflows/BuildWindows.yml @@ -1,4 +1,4 @@ -name: CompileWindows +name: BuildWindows on: [push, pull_request] diff --git a/ML_VERSION b/ML_VERSION index 8788969dd..e7eb9fea4 100644 --- a/ML_VERSION +++ b/ML_VERSION @@ -1 +1 @@ -2020.05 \ No newline at end of file +2020.06 \ No newline at end of file diff --git a/README.md b/README.md index b7cd9c5d1..ccacccee2 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # ![MeshLab Logo](src/meshlab/images/eye64.png) MeshLab -[![Actions Status](https://github.com/cnr-isti-vclab/meshlab/workflows/CompileUbuntu/badge.svg)](https://github.com/cnr-isti-vclab/meshlab/actions) -[![Actions Status](https://github.com/cnr-isti-vclab/meshlab/workflows/CompileMacOS/badge.svg)](https://github.com/cnr-isti-vclab/meshlab/actions) -[![Actions Status](https://github.com/cnr-isti-vclab/meshlab/workflows/CompileWindows/badge.svg)](https://github.com/cnr-isti-vclab/meshlab/actions) +![BuildUbuntu](https://github.com/cnr-isti-vclab/meshlab/workflows/BuildUbuntu/badge.svg) +![BuildMacOS](https://github.com/cnr-isti-vclab/meshlab/workflows/BuildMacOS/badge.svg) +![BuildWindows](https://github.com/cnr-isti-vclab/meshlab/workflows/BuildWindows/badge.svg) This is the official repository for the source and the binaries of MeshLab. diff --git a/install/linux/snap/snapcraft.yaml b/install/linux/snap/snapcraft.yaml index e290480b0..44ee76531 100644 --- a/install/linux/snap/snapcraft.yaml +++ b/install/linux/snap/snapcraft.yaml @@ -1,7 +1,7 @@ # Known to build in Ubuntu 18.04 name: meshlab base: core18 -version: '2020.05' +version: '2020.06' summary: MeshLab description: | The open source system for processing and editing 3D triangular meshes. diff --git a/src/meshlab/Info.plist b/src/meshlab/Info.plist index 2ff693775..80d001c79 100644 --- a/src/meshlab/Info.plist +++ b/src/meshlab/Info.plist @@ -68,11 +68,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2020.05 + 2020.06 CFBundleSignature ???? CFBundleVersion - 2020.05 + 2020.06 LSMinimumSystemVersion 10.12 NOTE