Skip to content

Commit 1f85da0

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'master' into aws
2 parents 1b2d2f4 + bd4812a commit 1f85da0

File tree

258 files changed

+6787
-150
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

258 files changed

+6787
-150
lines changed

‎.github/workflows/test.yml‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
2+
on:
3+
push:
4+
# The ignored paths must not include md files for the website itself
5+
paths-ignore:
6+
- '*.md'
7+
pull_request:
8+
paths-ignore:
9+
- '*.md'
10+
11+
env:
12+
DISPLAY: :99
13+
IS_PULLREQUEST: ${{ github.event_name == 'pull_request' }}
14+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
15+
16+
jobs:
17+
dummy:
18+
# https://github.com/AppImage/appimage.github.io/issues/2593
19+
runs-on: ubuntu-latest
20+
steps:
21+
- name: Pass dummy job
22+
run: |
23+
echo "passing"
24+
build:
25+
runs-on: ubuntu-18.04
26+
timeout-minutes: 5
27+
steps:
28+
- uses: actions/checkout@v2
29+
# https://github.com/actions/checkout#Fetch-all-history-for-all-tags-and-branches
30+
# According to the docs for checkout@v2, Only a single commit is fetched by default, but
31+
# providing a fetch-depth of 0 should fetch all history.
32+
with:
33+
fetch-depth: 0
34+
- name: Install dependencies
35+
run: |
36+
sudo apt update
37+
sudo apt-get -qq -y install sudo imagemagick libasound2-dev pulseaudio-utils alsa-utils alsa-oss libjack0 desktop-file-utils xmlstarlet xterm xvfb icewm x11-utils x11-apps netpbm xdotool libgl1-mesa-dri libgl1-mesa-dev mesa-utils libosmesa6 libsdl1.2-dev libsdl2-2.0-0 fonts-wqy-microhei libfile-mimeinfo-perl # appstream # TODO: Cache me!
38+
sudo bash code/prep-dummy-soundcard.sh
39+
sudo gem install dupervisor -v 1.0.5 # To convert ini to yaml files
40+
sudo npm install -g asar # to get pacakges.json from resources/app.asar for electron-builder applications
41+
# npm install -g @alexlafroscia/yaml-merge # to merge yaml files
42+
- name: Main test
43+
run: |
44+
mkdir $HOME/.icewm/
45+
echo "ShowTaskBar = 0" > $HOME/.icewm/preferences
46+
echo "TaskBarAutoHide = 1" > $HOME/.icewm/preferences
47+
echo "TaskBarShowWorkspaces = 0" > $HOME/.icewm/preferences
48+
echo "TaskBarShowAllWindows = 0" > $HOME/.icewm/preferences
49+
echo "TaskBarShowClock = 0" > $HOME/.icewm/preferences
50+
echo "TaskBarShowMailboxStatus = 0" > $HOME/.icewm/preferences
51+
echo "TaskBarShowCPUStatus = 0" > $HOME/.icewm/preferences
52+
echo "TaskBarShowWindowListMenu = 0" > $HOME/.icewm/preferences
53+
# xpra start :99 # Cannot get screenshots to work
54+
Xvfb :99 -screen 0 800x600x24 >/dev/null 2>&1 & # Need to set bit depth, otherwise get some black screenshots
55+
# until xset -q; do echo "Waiting for X server to start..."; sleep 1; done # We are not immediately using it anyway
56+
# Find out which files in data/ have been changed in the last commit
57+
#set -x # Debug #379
58+
FILES=$(git log -1 -p data/ | grep +++ | cut -d '/' -f 2-| sed -e 's|dev/null||g')
59+
echo "Last changed files from the FILES variable:"
60+
echo "$FILES" ; if [ -z "$FILES" ] ; then echo "Variable FILES is empty." && exit 1 ; fi
61+
# Work on these files that have been changed in the last commit
62+
# Check if $FILES is not empty
63+
if [ -n "$FILES" ] ; then for FILE in $FILES ; do echo "$FILE" ; bash -e code/worker.sh $(readlink -f "$FILE") 2>&1 | tee log.txt ; done ; fi
64+
# xpra stop :99
65+
killall Xvfb
66+
# bundle exec jekyll build # https://help.github.com/en/articles/viewing-jekyll-build-error-messages#configuring-a-third-party-service-to-display-jekyll-build-error-messages
67+
- name: Check log
68+
shell: bash
69+
run: |
70+
cat log.txt | wc -l
71+
grep -r "Running as root without --no-sandbox is not supported" log.txt && MESSAGE="Pending #2563 (\`Running as root without --no-sandbox is not supported\`)."
72+
grep -r "version \`GLIBC_.*' not found" && MESSAGE="This was compiled on a too new system and hence cannot run on all still-supported versions of Ubuntu."
73+
echo "${MESSAGE}"
74+
- name: Post test result to PR
75+
# Fails due to missing permissions, https://github.com/actions/first-interaction/issues/10
76+
if: 1 == 2
77+
# if: github.event_name == 'pull_request'
78+
uses: actions/github-script@v4
79+
with:
80+
script: |
81+
await github.issues.createComment({
82+
issue_number: context.issue.number,
83+
owner: context.repo.owner,
84+
repo: context.repo.repo,
85+
body: 'This comment is posted by the test'
86+
})

‎.mergify.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
pull_request_rules:
2+
- name: automatic update for PR marked as “Ready-to-Go“
3+
conditions:
4+
- -conflict # skip PRs with conflicts
5+
- -draft # filter-out GH draft PRs
6+
actions:
7+
update:

‎.travis.yml‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# AppImageHub [![Build Status](https://travis-ci.org/AppImage/appimage.github.io.svg?branch=master)](https://travis-ci.org/AppImage/appimage.github.io)
1+
# AppImageHub [![Build Status](https://github.com/AppImage/appimage.github.io/actions/workflows/test.yml/badge.svg)](https://github.com/AppImage/appimage.github.io/actions/workflows/test.yml)
22

33
https://appimage.github.io/
44

@@ -24,21 +24,21 @@ Create a new file using
2424

2525
### **[this link](https://github.com/AppImage/AppImageHub/new/master/data)**
2626

27-
and send a Pull Request.
27+
and send a Pull Request.
2828

2929
**The file should contain one line with a link to the GitHub repository that hosts AppImages on its Releases page.**
3030

3131
**Alternatively, a link to the AppImage. Nothing else.**
3232

33-
Then send a Pull Request to this repository. Travis CI will instantly perform an automated review of the AppImage, and in case it succeeds, you will see a __green__ result in your pull request. If you get a __red__ result, check the log of the Travis CI build, and fix it.
33+
Then send a Pull Request to this repository. GitHub Actions will instantly perform an automated review of the AppImage, and in case it succeeds, you will see a __green__ result in your pull request. If you get a __red__ result, check the log of the GitHub Actions build, and fix it.
3434

3535
### Checklist for submitting your own AppImage
3636

3737
As a format, AppImage is designed in a way that does not impose restrictions on the person generating AppImages. Basically you are free to put inside an AppImage whatever you want. For AppImageHub, however, additional rules apply. AppImages submitted to AppImage hub undergo automatic and possibly additional manual review.
3838

3939
* Must be downloadable from an URL. Our testing system fetches the AppImage using `wget`. Currently we cannot get AppImages from locations behind authentication and/or cookie-protected locations. For commercial applications we recommend to have a generally downloadable demo/trial version. Please contact us if you would like to add your commercial AppImage to the directory and it is not available for general download
4040
* Must run on the [oldest still-supported Ubuntu LTS release](https://www.ubuntu.com/info/release-end-of-life) (currently Ubuntu 18.04) without the installation of additional packages. Targeting the oldest still-supported LTS is to ensure that the AppImage will run not only on the very latest, but also on older target systems, such as enterprise distributions (not limited to Ubuntu)
41-
* Must execute in our Travis CI based testing environment
41+
* Must execute in our GitHub Actions based testing environment
4242
* Must pass [appdir-lint.sh](https://github.com/AppImage/AppImages/blob/master/appdir-lint.sh)
4343
* Must have a desktop file that passes `desktop-file-validate`
4444
* Must run without active Internet connection (and at least show some information)
@@ -61,7 +61,7 @@ As a format, AppImage is designed in a way that does not impose restrictions on
6161

6262
## How to use
6363

64-
App stores and software centers can consume the metadata collected by this project. See [AppImage ecosystem](https://github.com/AppImage/AppImageKit/wiki/Ecosystem).
64+
App stores and software centers can consume the metadata collected by this project. See [AppImage ecosystem](https://github.com/AppImage/AppImageKit/wiki/Ecosystem).
6565

6666
![peek 2017-11-26 11-28](https://user-images.githubusercontent.com/2480569/33243768-497bf74a-d2ba-11e7-8336-ae2018229e57.gif)
6767

‎_includes/app_teaser.html‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@
4242
</p>
4343
{% endif %}
4444

45-
{% if post.links %}
46-
<p id="links">
47-
{% include list_links.html %}
48-
</p>
49-
{% endif %}
45+
<p id="links">
46+
{% include list_links.html %}
47+
</p>

‎_includes/list_links.html‎

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,34 @@
1-
{% for link in post.links %}
2-
{% case link.type %}
3-
{% when "Launchpad" %}
4-
{% assign prefix = "https://launchpad.net/" %}
5-
{% when "Download" %}
6-
{% assign prefix = nil %}
7-
{% assign octicon = "octicon-desktop-download" %}
8-
{% when "GitHub" %}
9-
{% assign prefix = "https://github.com/" %}
10-
{% assign octicon = "octicon-mark-github" %}
11-
{% when "Twitter" %}
12-
{% assign prefix = "https://twitter.com/" %}
13-
{% when "Google+" %}
14-
{% assign prefix = "https://plus.google.com/" %}
15-
{% when "Bitbucket" %}
16-
{% assign prefix = "https://bitbucket.org/" %}
17-
{% when "Build" or "License" %}
18-
{% assign prefix = nil %}
19-
{% when "Screenshots" or "Videos" %}
20-
{% continue %}
21-
{% else %}
22-
{% assign prefix = nil %}
23-
{% assign octicon = nil %}
24-
{% endcase %}
25-
<a href="{{ prefix }}{{ link.url }}" class="button {% if link.name == "Download" or link.type == "Download" %}green{% else %}white{% endif %}">
26-
{% if octicon %}<span class="octicon {{ octicon }}"></span> {% endif %}{% if link.name %}{{ link.name }}{% else %}{{ link.type }}{% endif %}
27-
</a>
28-
{% if forloop.last == false %} {% endif %}
29-
{% endfor %}
1+
{% if post.links %}
2+
{% for link in post.links %}
3+
{% case link.type %}
4+
{% when "Launchpad" %}
5+
{% assign prefix = "https://launchpad.net/" %}
6+
{% when "Download" %}
7+
{% assign prefix = nil %}
8+
{% assign octicon = "octicon-desktop-download" %}
9+
{% when "GitHub" %}
10+
{% assign prefix = "https://github.com/" %}
11+
{% assign octicon = "octicon-mark-github" %}
12+
{% when "Twitter" %}
13+
{% assign prefix = "https://twitter.com/" %}
14+
{% when "Google+" %}
15+
{% assign prefix = "https://plus.google.com/" %}
16+
{% when "Bitbucket" %}
17+
{% assign prefix = "https://bitbucket.org/" %}
18+
{% when "Build" or "License" %}
19+
{% assign prefix = nil %}
20+
{% when "Screenshots" or "Videos" %}
21+
{% continue %}
22+
{% else %}
23+
{% assign prefix = nil %}
24+
{% assign octicon = nil %}
25+
{% endcase %}
26+
<a href="{{ prefix }}{{ link.url }}" class="button {% if link.name == "Download" or link.type == "Download" %}green{% else %}white{% endif %}">
27+
{% if octicon %}<span class="octicon {{ octicon }}"></span> {% endif %}{% if link.name %}{{ link.name }}{% else %}{{ link.type }}{% endif %}
28+
</a>
29+
{% if forloop.last == false %} {% endif %}
30+
{% endfor %}
31+
{% endif %}
3032

3133

3234
{% if post.appdata.Url.homepage %}

‎apps/Around.md‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
---
2+
layout: app
3+
4+
permalink: /Around/
5+
description: Video calls designed for energy, ideas and action
6+
7+
icons:
8+
- Around/icons/128x128/around.png
9+
10+
screenshots:
11+
- Around/screenshot.png
12+
13+
authors:
14+
15+
links:
16+
17+
desktop:
18+
Desktop Entry:
19+
Name: Around
20+
Exec: AppRun --no-sandbox %U
21+
Terminal: false
22+
Type: Application
23+
Icon: around
24+
StartupWMClass: Around
25+
X-AppImage-Version: 0.52.11
26+
Comment: Video calls designed for energy, ideas and action
27+
Categories: AudioVideo
28+
AppImageHub:
29+
X-AppImage-Signature: 'directory ''/home/runner/.gnupg'' created keybox ''/home/runner/.gnupg/pubring.kbx''
30+
created [don''t know]: invalid packet (ctb=0a) no signature found the signature
31+
could not be verified. Please remember that the signature file (.sig or .asc)
32+
should be the first file given on the command line.'
33+
X-AppImage-Type: 2
34+
X-AppImage-Architecture: x86_64
35+
36+
electron:
37+
homepage: https://www.around.co
38+
author:
39+
name: Teamport Inc.
40+
email: [email protected]
41+
main: build/index.js
42+
config:
43+
aroundElectron: bfe7b65c
44+
aroundElectronBeta: bdd9f976
45+
engines:
46+
node: ">=14.0.0"
47+
npm: ">=7.0.0"
48+
dependencies:
49+
"@sentry/electron": "^2.0.4"
50+
archiver: "^5.2.0"
51+
awaitqueue: "^2.3.3"
52+
dotenv: "^8.2.0"
53+
electron-prompt: "^1.6.2"
54+
electron-store: "^6.0.1"
55+
electron-updater: "^4.3.8"
56+
execa: "^2.1.0"
57+
fs-extra: "^9.0.1"
58+
get-folder-size: "^2.0.1"
59+
node-machine-id: "^1.1.12"
60+
push-receiver: "^2.1.1"
61+
robotjs: git+https://github.com/TeamAround/robotjs.git#5fe7ddfedd2bde70cdd91095202bf480860935a7
62+
semver: "^7.3.4"
63+
systeminformation: 5.7.4
64+
productName: Around
65+
---

0 commit comments

Comments
 (0)