From ac0e11530e512f831296acd65fcc2cd7b1fcd79b Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Mon, 1 Jun 2020 00:10:37 +0000 Subject: [PATCH 1/5] Apply automatic ML_VERSION, snapcraft.yaml and Info.plist change --- ML_VERSION | 2 +- install/linux/snap/snapcraft.yaml | 2 +- src/meshlab/Info.plist | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) 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/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 From a8ac30726a6760f76e99609f69321cd84495f306 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Mon, 1 Jun 2020 10:14:44 +0200 Subject: [PATCH 2/5] tmp mod --- ML_VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ML_VERSION b/ML_VERSION index e7eb9fea4..c266ff58a 100644 --- a/ML_VERSION +++ b/ML_VERSION @@ -1 +1 @@ -2020.06 \ No newline at end of file +2020.05 From 4469d6c5ef6cce1446077fd3addd6b091ecf8df0 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Mon, 1 Jun 2020 10:30:27 +0200 Subject: [PATCH 3/5] tmp commit for release --- .github/workflows/CompileAndRelease.yml | 14 +++++++------- .github/workflows/CompileUbuntu.yml | 3 ++- ML_VERSION | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/CompileAndRelease.yml b/.github/workflows/CompileAndRelease.yml index 7903f7293..b1e3b9447 100755 --- a/.github/workflows/CompileAndRelease.yml +++ b/.github/workflows/CompileAndRelease.yml @@ -1,9 +1,9 @@ name: CompileAndRelease on: - #[push, pull_request] #just for test release scripts - schedule: - - cron: '0 0 1 * *' #every first day of the month at midnight + [push, pull_request] #just for test release scripts + #schedule: + # - cron: '0 0 1 * *' #every first day of the month at midnight jobs: update_ml_version: @@ -31,10 +31,10 @@ jobs: - name: Update Snap file run: | sed "s%MESHLAB_VERSION%$(cat ML_VERSION)%g" install/linux/snap/local/snap_noversion.yaml > install/linux/snap/snapcraft.yaml - - name: commit ML_VERSION, snapcraft.yaml and Info.plist change - uses: stefanzweifel/git-auto-commit-action@v4.1.1 - with: - commit_message: Apply automatic ML_VERSION, snapcraft.yaml and Info.plist change + #- name: commit ML_VERSION, snapcraft.yaml and Info.plist change + # uses: stefanzweifel/git-auto-commit-action@v4.1.1 + # with: + # commit_message: Apply automatic ML_VERSION, snapcraft.yaml and Info.plist change ubuntu_build_appimage: needs: [update_ml_version] diff --git a/.github/workflows/CompileUbuntu.yml b/.github/workflows/CompileUbuntu.yml index 84865c057..2a1db1ea9 100755 --- a/.github/workflows/CompileUbuntu.yml +++ b/.github/workflows/CompileUbuntu.yml @@ -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/ML_VERSION b/ML_VERSION index c266ff58a..e7eb9fea4 100644 --- a/ML_VERSION +++ b/ML_VERSION @@ -1 +1 @@ -2020.05 +2020.06 \ No newline at end of file From cc01ad5c2ea36cb2a343acc4ef09311b65f8d27f Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Mon, 1 Jun 2020 11:03:32 +0200 Subject: [PATCH 4/5] restore build and release --- ...CompileAndRelease.yml => BuildAndRelease.yml} | 16 ++++++++-------- .../{CompileMacOS.yml => BuildMacOS.yml} | 2 +- .../{CompileUbuntu.yml => BuildUbuntu.yml} | 2 +- .../{CompileWindows.yml => BuildWindows.yml} | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) rename .github/workflows/{CompileAndRelease.yml => BuildAndRelease.yml} (97%) mode change 100755 => 100644 rename .github/workflows/{CompileMacOS.yml => BuildMacOS.yml} (98%) mode change 100755 => 100644 rename .github/workflows/{CompileUbuntu.yml => BuildUbuntu.yml} (99%) mode change 100755 => 100644 rename .github/workflows/{CompileWindows.yml => BuildWindows.yml} (99%) diff --git a/.github/workflows/CompileAndRelease.yml b/.github/workflows/BuildAndRelease.yml old mode 100755 new mode 100644 similarity index 97% rename from .github/workflows/CompileAndRelease.yml rename to .github/workflows/BuildAndRelease.yml index b1e3b9447..2cd126959 --- 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 + #[push, pull_request] #just for test release scripts + schedule: + - cron: '0 1 1 * *' #every first day of the month at 1am jobs: update_ml_version: @@ -31,10 +31,10 @@ jobs: - name: Update Snap file run: | sed "s%MESHLAB_VERSION%$(cat ML_VERSION)%g" install/linux/snap/local/snap_noversion.yaml > install/linux/snap/snapcraft.yaml - #- name: commit ML_VERSION, snapcraft.yaml and Info.plist change - # uses: stefanzweifel/git-auto-commit-action@v4.1.1 - # with: - # commit_message: Apply automatic ML_VERSION, snapcraft.yaml and Info.plist change + - name: commit ML_VERSION, snapcraft.yaml and Info.plist change + uses: stefanzweifel/git-auto-commit-action@v4.1.1 + with: + commit_message: Apply automatic ML_VERSION, snapcraft.yaml and Info.plist change ubuntu_build_appimage: needs: [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 96d153486..66f5594cc --- 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 99% rename from .github/workflows/CompileUbuntu.yml rename to .github/workflows/BuildUbuntu.yml index 2a1db1ea9..aee2d3c49 --- a/.github/workflows/CompileUbuntu.yml +++ b/.github/workflows/BuildUbuntu.yml @@ -1,4 +1,4 @@ -name: CompileUbuntu +name: BuildUbuntu on: [push, pull_request] 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 43e84a00d..62880ca3c 100644 --- a/.github/workflows/CompileWindows.yml +++ b/.github/workflows/BuildWindows.yml @@ -1,4 +1,4 @@ -name: CompileWindows +name: BuildWindows on: [push, pull_request] From 3b8d3bcabc15c34251dca270a81f60b41aa03f88 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Mon, 1 Jun 2020 11:06:15 +0200 Subject: [PATCH 5/5] update readme build badges --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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.