@@ -87,7 +87,7 @@ docs-deploy: | |||||
stage: deploy | stage: deploy | ||||
image: alpine:3.9 | image: alpine:3.9 | ||||
only: | only: | ||||
- master@pleroma/pleroma | |||||
- stable@pleroma/pleroma | |||||
- develop@pleroma/pleroma | - develop@pleroma/pleroma | ||||
before_script: | before_script: | ||||
- apk update && apk add openssh-client rsync | - apk update && apk add openssh-client rsync | ||||
@@ -149,9 +149,10 @@ amd64: | |||||
# TODO: Replace with upstream image when 1.9.0 comes out | # TODO: Replace with upstream image when 1.9.0 comes out | ||||
image: rinpatch/elixir:1.9.0-rc.0 | image: rinpatch/elixir:1.9.0-rc.0 | ||||
only: &release-only | only: &release-only | ||||
- master@pleroma/pleroma | |||||
- stable@pleroma/pleroma | |||||
- develop@pleroma/pleroma | - develop@pleroma/pleroma | ||||
- /^maint/.*$/@pleroma/pleroma | - /^maint/.*$/@pleroma/pleroma | ||||
- /^release/.*$/@pleroma/pleroma | |||||
artifacts: &release-artifacts | artifacts: &release-artifacts | ||||
name: "pleroma-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA-$CI_JOB_NAME" | name: "pleroma-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA-$CI_JOB_NAME" | ||||
paths: | paths: | ||||
@@ -87,7 +87,7 @@ sudo adduser -S -s /bin/false -h /opt/pleroma -H pleroma | |||||
```shell | ```shell | ||||
sudo mkdir -p /opt/pleroma | sudo mkdir -p /opt/pleroma | ||||
sudo chown -R pleroma:pleroma /opt/pleroma | sudo chown -R pleroma:pleroma /opt/pleroma | ||||
sudo -Hu pleroma git clone -b master https://git.pleroma.social/pleroma/pleroma /opt/pleroma | |||||
sudo -Hu pleroma git clone -b stable https://git.pleroma.social/pleroma/pleroma /opt/pleroma | |||||
``` | ``` | ||||
* Change to the new directory: | * Change to the new directory: | ||||
@@ -66,7 +66,7 @@ sudo useradd -r -s /bin/false -m -d /var/lib/pleroma -U pleroma | |||||
```shell | ```shell | ||||
sudo mkdir -p /opt/pleroma | sudo mkdir -p /opt/pleroma | ||||
sudo chown -R pleroma:pleroma /opt/pleroma | sudo chown -R pleroma:pleroma /opt/pleroma | ||||
sudo -Hu pleroma git clone -b master https://git.pleroma.social/pleroma/pleroma /opt/pleroma | |||||
sudo -Hu pleroma git clone -b stable https://git.pleroma.social/pleroma/pleroma /opt/pleroma | |||||
``` | ``` | ||||
* Change to the new directory: | * Change to the new directory: | ||||
@@ -143,7 +143,7 @@ sudo useradd -r -s /bin/false -m -d /var/lib/pleroma -U pleroma | |||||
```shell | ```shell | ||||
sudo mkdir -p /opt/pleroma | sudo mkdir -p /opt/pleroma | ||||
sudo chown -R pleroma:pleroma /opt/pleroma | sudo chown -R pleroma:pleroma /opt/pleroma | ||||
sudo -Hu pleroma git clone -b master https://git.pleroma.social/pleroma/pleroma /opt/pleroma | |||||
sudo -Hu pleroma git clone -b stable https://git.pleroma.social/pleroma/pleroma /opt/pleroma | |||||
``` | ``` | ||||
* Change to the new directory: | * Change to the new directory: | ||||
@@ -68,7 +68,7 @@ sudo useradd -r -s /bin/false -m -d /var/lib/pleroma -U pleroma | |||||
```shell | ```shell | ||||
sudo mkdir -p /opt/pleroma | sudo mkdir -p /opt/pleroma | ||||
sudo chown -R pleroma:pleroma /opt/pleroma | sudo chown -R pleroma:pleroma /opt/pleroma | ||||
sudo -Hu pleroma git clone -b master https://git.pleroma.social/pleroma/pleroma /opt/pleroma | |||||
sudo -Hu pleroma git clone -b stable https://git.pleroma.social/pleroma/pleroma /opt/pleroma | |||||
``` | ``` | ||||
* Change to the new directory: | * Change to the new directory: | ||||
@@ -69,7 +69,9 @@ cd ~ | |||||
* Gitリポジトリをクローンします。 | * Gitリポジトリをクローンします。 | ||||
``` | ``` | ||||
git clone -b master https://git.pleroma.social/pleroma/pleroma | |||||
sudo mkdir -p /opt/pleroma | |||||
sudo chown -R pleroma:pleroma /opt/pleroma | |||||
sudo -Hu pleroma git clone -b stable https://git.pleroma.social/pleroma/pleroma /opt/pleroma | |||||
``` | ``` | ||||
* 新しいディレクトリに移動します。 | * 新しいディレクトリに移動します。 | ||||
@@ -106,7 +106,7 @@ It is highly recommended you use your own fork for the `https://path/to/repo` pa | |||||
```shell | ```shell | ||||
pleroma$ cd ~ | pleroma$ cd ~ | ||||
pleroma$ git clone -b master https://path/to/repo | |||||
pleroma$ git clone -b stable https://path/to/repo | |||||
``` | ``` | ||||
* Change to the new directory: | * Change to the new directory: | ||||
@@ -96,9 +96,9 @@ rm -r ~pleroma/* | |||||
export FLAVOUR="arm64-musl" | export FLAVOUR="arm64-musl" | ||||
# Clone the release build into a temporary directory and unpack it | # Clone the release build into a temporary directory and unpack it | ||||
# Replace `master` with `develop` if you want to run the develop branch | |||||
# Replace `stable` with `unstable` if you want to run the unstable branch | |||||
su pleroma -s $SHELL -lc " | su pleroma -s $SHELL -lc " | ||||
curl 'https://git.pleroma.social/api/v4/projects/2/jobs/artifacts/master/download?job=$FLAVOUR' -o /tmp/pleroma.zip | |||||
curl 'https://git.pleroma.social/api/v4/projects/2/jobs/artifacts/stable/download?job=$FLAVOUR' -o /tmp/pleroma.zip | |||||
unzip /tmp/pleroma.zip -d /tmp/ | unzip /tmp/pleroma.zip -d /tmp/ | ||||
" | " | ||||
@@ -58,7 +58,7 @@ Clone the repository: | |||||
``` | ``` | ||||
$ cd /home/pleroma | $ cd /home/pleroma | ||||
$ git clone -b master https://git.pleroma.social/pleroma/pleroma.git | |||||
$ git clone -b stable https://git.pleroma.social/pleroma/pleroma.git | |||||
``` | ``` | ||||
Configure Pleroma. Note that you need a domain name at this point: | Configure Pleroma. Note that you need a domain name at this point: | ||||
@@ -29,7 +29,7 @@ This creates a "pleroma" login class and sets higher values than default for dat | |||||
Create the \_pleroma user, assign it the pleroma login class and create its home directory (/home/\_pleroma/): `useradd -m -L pleroma _pleroma` | Create the \_pleroma user, assign it the pleroma login class and create its home directory (/home/\_pleroma/): `useradd -m -L pleroma _pleroma` | ||||
#### Clone pleroma's directory | #### Clone pleroma's directory | ||||
Enter a shell as the \_pleroma user. As root, run `su _pleroma -;cd`. Then clone the repository with `git clone -b master https://git.pleroma.social/pleroma/pleroma.git`. Pleroma is now installed in /home/\_pleroma/pleroma/, it will be configured and started at the end of this guide. | |||||
Enter a shell as the \_pleroma user. As root, run `su _pleroma -;cd`. Then clone the repository with `git clone -b stable https://git.pleroma.social/pleroma/pleroma.git`. Pleroma is now installed in /home/\_pleroma/pleroma/, it will be configured and started at the end of this guide. | |||||
#### Postgresql | #### Postgresql | ||||
Start a shell as the \_postgresql user (as root run `su _postgresql -` then run the `initdb` command to initialize postgresql: | Start a shell as the \_postgresql user (as root run `su _postgresql -` then run the `initdb` command to initialize postgresql: | ||||
@@ -44,7 +44,7 @@ Vaihda pleroma-käyttäjään ja mene kotihakemistoosi: | |||||
Lataa pleroman lähdekoodi: | Lataa pleroman lähdekoodi: | ||||
`$ git clone -b master https://git.pleroma.social/pleroma/pleroma.git` | |||||
`$ git clone -b stable https://git.pleroma.social/pleroma/pleroma.git` | |||||
`$ cd pleroma` | `$ cd pleroma` | ||||
@@ -80,7 +80,7 @@ export FLAVOUR="arm64-musl" | |||||
# Clone the release build into a temporary directory and unpack it | # Clone the release build into a temporary directory and unpack it | ||||
su pleroma -s $SHELL -lc " | su pleroma -s $SHELL -lc " | ||||
curl 'https://git.pleroma.social/api/v4/projects/2/jobs/artifacts/master/download?job=$FLAVOUR' -o /tmp/pleroma.zip | |||||
curl 'https://git.pleroma.social/api/v4/projects/2/jobs/artifacts/stable/download?job=$FLAVOUR' -o /tmp/pleroma.zip | |||||
unzip /tmp/pleroma.zip -d /tmp/ | unzip /tmp/pleroma.zip -d /tmp/ | ||||
" | " | ||||
@@ -215,7 +215,10 @@ defmodule Pleroma.Mixfile do | |||||
with {branch_name, 0} <- System.cmd("git", ["rev-parse", "--abbrev-ref", "HEAD"]), | with {branch_name, 0} <- System.cmd("git", ["rev-parse", "--abbrev-ref", "HEAD"]), | ||||
branch_name <- String.trim(branch_name), | branch_name <- String.trim(branch_name), | ||||
branch_name <- System.get_env("PLEROMA_BUILD_BRANCH") || branch_name, | branch_name <- System.get_env("PLEROMA_BUILD_BRANCH") || branch_name, | ||||
true <- branch_name not in ["master", "HEAD"] do | |||||
true <- | |||||
!Enum.all?(["master", "HEAD", "release/", "stable"], fn name -> | |||||
name != branch_name | |||||
end) do | |||||
branch_name = | branch_name = | ||||
branch_name | branch_name | ||||
|> String.trim() | |> String.trim() | ||||