Merge remote-tracking branch 'origin/master' into remove_qtscript

This commit is contained in:
alemuntoni 2020-06-01 12:12:46 +02:00
commit 1611d093ee
8 changed files with 14 additions and 13 deletions

View File

@ -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:

View File

@ -1,4 +1,4 @@
name: CompileMacOS
name: BuildMacOS
on:
[push, pull_request]

View File

@ -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

View File

@ -1,4 +1,4 @@
name: CompileWindows
name: BuildWindows
on: [push, pull_request]

View File

@ -1 +1 @@
2020.05
2020.06

View File

@ -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.

View File

@ -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.

View File

@ -68,11 +68,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>2020.05</string>
<string>2020.06</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>2020.05</string>
<string>2020.06</string>
<key>LSMinimumSystemVersion</key>
<string>10.12</string>
<key>NOTE</key>