aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Vijay A <avijayr@protonmail.com>2021-07-12 08:51:32 +0530
committerLibravatar Vijay A <avijayr@protonmail.com>2021-07-12 08:55:07 +0530
commitac7ce5b5e47c2f5f9ddfb37089b3e5c2f867d8d4 (patch)
tree9ca1de72c3b2e4b313146cfc3b4d787f7eb2ad28
parent5.6.0-nightly.83 (diff)
downloadferdium-app-ac7ce5b5e47c2f5f9ddfb37089b3e5c2f867d8d4.tar.gz
ferdium-app-ac7ce5b5e47c2f5f9ddfb37089b3e5c2f867d8d4.tar.zst
ferdium-app-ac7ce5b5e47c2f5f9ddfb37089b3e5c2f867d8d4.zip
Documentation updates taken from #1629 [skip ci]
Co-authored-by: mhatvan <markus_hatvan@aon.at>
-rw-r--r--.github/workflows/ferdi-builds.yml14
-rw-r--r--CONTRIBUTING.md6
-rw-r--r--Dockerfile2
3 files changed, 11 insertions, 11 deletions
diff --git a/.github/workflows/ferdi-builds.yml b/.github/workflows/ferdi-builds.yml
index c0ac073d0..277721c8c 100644
--- a/.github/workflows/ferdi-builds.yml
+++ b/.github/workflows/ferdi-builds.yml
@@ -2,13 +2,13 @@
2# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions 2# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
3 3
4# Note: This workflow requires some secrets setup, and set on this repo with the names: 4# Note: This workflow requires some secrets setup, and set on this repo with the names:
5 # 'FERDI_PUBLISH_TOKEN' (A GitHub Personal Access Token with appropriate permissions - for publishing the built artifacts) 5# 'FERDI_PUBLISH_TOKEN' (A GitHub Personal Access Token with appropriate permissions - for publishing the built artifacts)
6 # 'APPLEID' (The username of your Apple developer account - for notarizing the mac artifacts) 6# 'APPLEID' (The username of your Apple developer account - for notarizing the mac artifacts)
7 # 'APPLEID_PASSWORD' (An app-specific password - for notarizing the mac artifacts) 7# 'APPLEID_PASSWORD' (An app-specific password - for notarizing the mac artifacts)
8 # 'CSC_LINK' (The HTTPS link or local path to certificate - for code signing of mac artifacts) 8# 'CSC_LINK' (The HTTPS link or local path to certificate - for code signing of mac artifacts)
9 # 'CSC_KEY_PASSWORD' (The password to decrypt the certificate given in CSC_LINK - for code signing of mac artifacts) 9# 'CSC_KEY_PASSWORD' (The password to decrypt the certificate given in CSC_LINK - for code signing of mac artifacts)
10 # 'WIN_CSC_LINK' (The HTTPS link or local path to certificate - for code signing of windows artifacts) 10# 'WIN_CSC_LINK' (The HTTPS link or local path to certificate - for code signing of windows artifacts)
11 # 'WIN_CSC_KEY_PASSWORD' (The password to decrypt the certificate given in CSC_LINK - for code signing of windows artifacts) 11# 'WIN_CSC_KEY_PASSWORD' (The password to decrypt the certificate given in CSC_LINK - for code signing of windows artifacts)
12 12
13name: Ferdi Builds 13name: Ferdi Builds
14 14
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bf078dfaa..0b643ea10 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -52,9 +52,9 @@ As a basic rule, before filing issues, feature requests or anything else. Take a
52 52
53#### Node.js, npm, node-gyp 53#### Node.js, npm, node-gyp
54 54
55Please make sure you are running the exact node version used by the developers/contributors as specified in the [nvmrc file](./.nvmrc). 55Please make sure you are conforming to the `engines` requirements used by the developers/contributors as specified in the [package.json file](./package.json#engines).
56 56
57Currently, these are the combinations of system dependencies that work on an intel-based machines for MacOS/Linux/Windows (building on an ARM-based machine is still a work-in-progress due to node-sass native dependencies) 57Currently, these are the combinations of system dependencies that work for MacOS/Linux/Windows:
58 58
59```bash 59```bash
60node -v 60node -v
@@ -74,7 +74,7 @@ _Note:_ This list can likely get outdated. If so, please refer to the specific v
74#### Debian/Ubuntu 74#### Debian/Ubuntu
75 75
76```bash 76```bash
77apt-get update -y && apt install -y rpm ruby gem && gem install fpm --no-ri --no-rdoc --no-document 77apt-get update -y && apt-get install --no-install-recommends -y rpm ruby gem && gem install fpm --no-ri --no-rdoc --no-document
78``` 78```
79 79
80#### Fedora 80#### Fedora
diff --git a/Dockerfile b/Dockerfile
index 005d25e4d..bb0381d31 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ ARG USE_SYSTEM_FPM=true
13ARG PREVAL_BUILD_INFO_PLACEHOLDERS=true 13ARG PREVAL_BUILD_INFO_PLACEHOLDERS=true
14 14
15RUN apt-get update -y \ 15RUN apt-get update -y \
16 && apt-get install -y rpm ruby gem \ 16 && apt-get install --no-install-recommends -y rpm ruby gem \
17 && gem install fpm --no-ri --no-rdoc --no-document 17 && gem install fpm --no-ri --no-rdoc --no-document
18 18
19WORKDIR /usr/src/ferdi 19WORKDIR /usr/src/ferdi