Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/stellarium/stellarium int…
Browse files Browse the repository at this point in the history
…o CICD
  • Loading branch information
ultrapre committed Apr 7, 2021
2 parents 8ff4f56 + 293dc21 commit 5b27711
Show file tree
Hide file tree
Showing 852 changed files with 148,219 additions and 267,887 deletions.
22 changes: 16 additions & 6 deletions .github/label-commenter-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ labels:
- name: invalid
labeled:
issue:
body: Please follow the issue templates.
body: This is not a bug or at least we just don't understand your problem. Please follow the issue templates.
action: close
pr:
body: Thank you @{{ pull_request.user.login }} for suggesting this. Please follow the pull request templates.
body: Thanks to @{{ pull_request.user.login }} for suggesting this. Please follow the pull request templates.
action: close
unlabeled:
issue:
Expand All @@ -23,19 +23,23 @@ labels:
- name: incomplete
labeled:
issue:
body: Please follow the issue template - the hardware info, steps of reproduction and log file are really important and help us resolve over 90% issues fast. Of course, in some specific cases we need more data, but we ask the required data separately...
body: The hardware info, steps of reproduction and log file are really important and help us resolve over 90% issues fast. Of course, in some specific cases we need more data, but we ask the required data separately...
- name: enhancement
labeled:
issue:
body: Thank you @{{ issue.user.login }} for suggesting this enhancement.
body: Thanks to @{{ issue.user.login }} for suggesting this enhancement.
- name: feature request
labeled:
issue:
body: Thank you @{{ issue.user.login }} for suggesting this feature.
body: Thanks to @{{ issue.user.login }} for suggesting this feature.
- name: wishlist
labeled:
issue:
body: Thank you @{{ issue.user.login }} for suggesting this.
body: Thanks to @{{ issue.user.login }} for suggesting this.
- name: confirmed
labeled:
issue:
body: OK, developers can reproduce the issue. Thanks to @{{ issue.user.login }} for the report!
- name: won't fix
labeled:
issue:
Expand All @@ -61,6 +65,12 @@ labels:
This site actually does not discuss the Mobile version. Please use its own feedback system:
https://www.stellarium-labs.com/support/
action: close
- name: translations
labeled:
issue:
body: |
Thanks @{{ issue.user.login }}! In future please use Transifex to fix and improve translations:
https://www.transifex.com/stellarium/stellarium/dashboard/
- name: fix committed
labeled:
issue:
Expand Down
169 changes: 84 additions & 85 deletions .github/workflows/appimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@
#
name: "AppImage"

on:
push:
branches: [release]
on: [push]

jobs:
# AppImage x86_64
appimage-amd64:
name: "x86_64"
runs-on: ubuntu-18.04
if: "contains(github.event.head_commit.message, '[publish]') || contains(github.ref, 'heads/release')"

steps:
- name: Checkout repository
Expand Down Expand Up @@ -48,85 +47,85 @@ jobs:
name: 'Stellarium-edge-x86_64'
path: ${{ github.workspace }}/artifact/*.AppImage

# # AppImage ARM
# appimage-arm:
# name: "${{ matrix.arch }}"
# runs-on: ubuntu-18.04
#
# strategy:
# matrix:
# include:
# - arch: aarch64
# qarch: aarch64
# march: aarch64
# - arch: armv7
# qarch: arm
# march: armhf
#
# steps:
# - name: Checkout repository
# uses: actions/checkout@v2
#
# - name: Download static QEMU (${{ matrix.qarch }})
# run: |
# wget https://github.com/multiarch/qemu-user-static/releases/download/v5.1.0-7/qemu-${{ matrix.qarch }}-static -O ${{ runner.temp }}/qemu-static
# chmod +x ${{ runner.temp }}/qemu-static
#
# - name: Build AppImage
# uses: uraimo/[email protected]
# id: appimage
# with:
# arch: ${{ matrix.arch }}
# distro: ubuntu18.04
#
# # Not required, but speeds up builds by storing container images in
# # a GitHub package registry.
# githubToken: ${{ github.GITHUB_TOKEN }}
#
# # Create an artifacts directory
# setup: |
# mkdir -p "${PWD}/artifact"
#
# # Mount the artifacts directory as /artifact in the container
# dockerRunArgs: |
# --volume "${PWD}/artifact:/artifact"
# --volume "${{ runner.temp }}/qemu-static:/usr/bin/qemu-static"
#
# # The shell to run commands with in the container
# shell: /bin/bash
#
# # Install some dependencies in the container. This speeds up builds if
# # you are also using githubToken. Any dependencies installed here will
# # be part of the container image that gets cached, so subsequent
# # builds don't have to re-install them. The image layer is cached
# # publicly in your project's package repository, so it is vital that
# # no secrets are present in the container state or logs.
# install: |
# # Update installed packages
# apt-get update -y
# ACCEPT_EULA=Y apt-get upgrade -y
# # Installing dependencies
# apt-get install -y qtbase5-dev qtscript5-dev libqt5svg5-dev qttools5-dev-tools qttools5-dev libqt5opengl5-dev qtmultimedia5-dev libqt5multimedia5-plugins libqt5serialport5 libqt5serialport5-dev qtpositioning5-dev libgps-dev libqt5positioning5 libqt5positioning5-plugins zlib1g-dev libgl1-mesa-dev libdrm-dev cmake wget python3-pip python3-setuptools patchelf desktop-file-utils libgdk-pixbuf2.0-dev fakeroot
# pip3 install appimage-builder
#
# # Produce a binary artifact and place it in the mounted volume
# run: |
# wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-${{ matrix.march }}.AppImage -O /opt/appimagetool
# chmod +x /opt/appimagetool
# cd /opt
# qemu-static /opt/appimagetool --appimage-extract
# mv /opt/squashfs-root /opt/appimagetool.AppDir
# ln -s /opt/appimagetool.AppDir/AppRun /usr/local/bin/appimagetool
# mkdir -p ${{ github.workspace }}/builds/appimage
# cd ${{ github.workspace }}/builds/appimage
# export APP_VERSION="edge"
# appimage-builder --recipe ${{ github.workspace }}/util/appimage/stellarium-appimage-${{ matrix.march }}.yml --skip-test
# cp ${{ github.workspace }}/builds/appimage/*.AppImage /artifact
#
# - name: Upload AppImage
# uses: actions/upload-artifact@v2
# if: success()
# with:
# name: 'Stellarium-edge-${{ matrix.arch }}'
# path: ${{ github.workspace }}/artifact/*.AppImage
#
# AppImage ARM
appimage-arm:
strategy:
matrix:
include:
- arch: aarch64
qarch: aarch64
march: aarch64
- arch: armv7
qarch: arm
march: armhf
name: "${{ matrix.arch }}"
runs-on: ubuntu-18.04
if: "contains(github.event.head_commit.message, '[publish]') || contains(github.ref, 'heads/release')"

steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Download static QEMU (${{ matrix.qarch }})
run: |
wget https://github.com/multiarch/qemu-user-static/releases/download/v5.2.0-2/qemu-${{ matrix.qarch }}-static -O ${{ runner.temp }}/qemu-static
chmod +x ${{ runner.temp }}/qemu-static
- name: Build AppImage
uses: uraimo/[email protected]
id: appimage
with:
arch: ${{ matrix.arch }}
distro: ubuntu18.04

# Not required, but speeds up builds by storing container images in
# a GitHub package registry.
githubToken: ${{ github.GITHUB_TOKEN }}

# Create an artifacts directory
setup: |
mkdir -p "${PWD}/artifact"
# Mount the artifacts directory as /artifact in the container
dockerRunArgs: |
--volume "${PWD}/artifact:/artifact"
--volume "${{ runner.temp }}/qemu-static:/usr/bin/qemu-static"
# The shell to run commands with in the container
shell: /bin/bash

# Install some dependencies in the container. This speeds up builds if
# you are also using githubToken. Any dependencies installed here will
# be part of the container image that gets cached, so subsequent
# builds don't have to re-install them. The image layer is cached
# publicly in your project's package repository, so it is vital that
# no secrets are present in the container state or logs.
install: |
# Update installed packages
apt-get update -y
ACCEPT_EULA=Y apt-get upgrade -y
# Installing dependencies
apt-get install -y qtbase5-dev qtscript5-dev libqt5svg5-dev qttools5-dev-tools qttools5-dev libqt5opengl5-dev qtmultimedia5-dev libqt5multimedia5-plugins libqt5serialport5 libqt5serialport5-dev qtpositioning5-dev libgps-dev libqt5positioning5 libqt5positioning5-plugins zlib1g-dev libgl1-mesa-dev libdrm-dev cmake wget python3-pip python3-setuptools patchelf desktop-file-utils libgdk-pixbuf2.0-dev fakeroot
pip3 install appimage-builder
# Produce a binary artifact and place it in the mounted volume
run: |
wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-${{ matrix.march }}.AppImage -O /opt/appimagetool
chmod +x /opt/appimagetool
cd /opt
qemu-static /opt/appimagetool --appimage-extract
mv /opt/squashfs-root /opt/appimagetool.AppDir
ln -s /opt/appimagetool.AppDir/AppRun /usr/local/bin/appimagetool
mkdir -p ${{ github.workspace }}/builds/appimage
cd ${{ github.workspace }}/builds/appimage
export APP_VERSION="edge"
appimage-builder --recipe ${{ github.workspace }}/util/appimage/stellarium-appimage-${{ matrix.march }}.yml --skip-test
cp ${{ github.workspace }}/builds/appimage/*.AppImage /artifact
- name: Upload AppImage
uses: actions/upload-artifact@v2
if: success()
with:
name: 'Stellarium-edge-${{ matrix.arch }}'
path: ${{ github.workspace }}/artifact/*.AppImage

4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ SET( ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/android )
PROJECT(Stellarium)
# Use integer versions instead of strings for easier handling if required
SET(STELLARIUM_MAJOR 0)
SET(STELLARIUM_MINOR 20)
SET(STELLARIUM_PATCH 4)
SET(STELLARIUM_MINOR 21)
SET(STELLARIUM_PATCH 0)
ADD_DEFINITIONS(
-DSTELLARIUM_MAJOR=${STELLARIUM_MAJOR}
-DSTELLARIUM_MINOR=${STELLARIUM_MINOR}
Expand Down
15 changes: 15 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
0.21.0 [2021-03-28]
The major changes of this version:
- We have finally completed our work on accurate planet axes,
including Lunar libration
- Visualisation of Earth shadow for Lunar eclipses
- Better texture for the Lunar surface
- Added the latest algorithms for planet magnitudes
- Enhanced Calendars plugin
- Replaced "arabic" by more accurate "al-Sufi" skyculture
- Planets are now scalable and Solar glare switchable for didactic
applications

We have also published a scientific paper about the application of
Stellarium in cultural astronomy: https://doi.org/10.1558/jsa.17822

0.20.4 [2020-12-28]
The major changes of this version:
- Added Calendars plugin
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ If you are new to Stellarium, go to [www.stellarium.org](https://www.stellarium.

## Installation Instructions & Quick Start

Please refer to the [User Guide, Getting Started section](https://github.com/Stellarium/stellarium/releases/download/v0.20.4/stellarium_user_guide-0.20.4-1.pdf).
Please refer to the [User Guide, Getting Started section](https://github.com/Stellarium/stellarium/releases/download/v0.21.0/stellarium_user_guide-0.21.0-1.pdf).

## Get & build the code

Expand Down
Loading

0 comments on commit 5b27711

Please sign in to comment.