Change main branch to main
This commit is contained in:
parent
edd9738ddb
commit
de774beacd
2 changed files with 17 additions and 17 deletions
32
.drone.yml
32
.drone.yml
|
@ -4,7 +4,7 @@ name: build
|
||||||
trigger:
|
trigger:
|
||||||
branch:
|
branch:
|
||||||
include:
|
include:
|
||||||
- master
|
- main
|
||||||
event:
|
event:
|
||||||
include:
|
include:
|
||||||
- push
|
- push
|
||||||
|
@ -134,7 +134,7 @@ depends_on:
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
branch:
|
branch:
|
||||||
- master
|
- main
|
||||||
event:
|
event:
|
||||||
- push
|
- push
|
||||||
|
|
||||||
|
@ -180,7 +180,7 @@ steps:
|
||||||
pull: true
|
pull: true
|
||||||
commands:
|
commands:
|
||||||
- cd dist
|
- cd dist
|
||||||
- zip -r ../vikunja-frontend-master.zip *
|
- zip -r ../vikunja-frontend-unstable.zip *
|
||||||
- cd ..
|
- cd ..
|
||||||
depends_on: [ build ]
|
depends_on: [ build ]
|
||||||
|
|
||||||
|
@ -196,7 +196,7 @@ steps:
|
||||||
endpoint: https://s3.fr-par.scw.cloud
|
endpoint: https://s3.fr-par.scw.cloud
|
||||||
region: fr-par
|
region: fr-par
|
||||||
path_style: true
|
path_style: true
|
||||||
source: vikunja-frontend-master.zip
|
source: vikunja-frontend-unstable.zip
|
||||||
target: /frontend/
|
target: /frontend/
|
||||||
depends_on: [ static ]
|
depends_on: [ static ]
|
||||||
|
|
||||||
|
@ -279,7 +279,7 @@ name: trigger-desktop-update
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
branch:
|
branch:
|
||||||
- master
|
- main
|
||||||
event:
|
event:
|
||||||
- push
|
- push
|
||||||
|
|
||||||
|
@ -294,7 +294,7 @@ steps:
|
||||||
token:
|
token:
|
||||||
from_secret: drone_token
|
from_secret: drone_token
|
||||||
repositories:
|
repositories:
|
||||||
- vikunja/desktop@master
|
- vikunja/desktop@main
|
||||||
|
|
||||||
---
|
---
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
|
@ -311,7 +311,7 @@ platform:
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
ref:
|
ref:
|
||||||
- refs/heads/master
|
- refs/heads/main
|
||||||
- "refs/tags/**"
|
- "refs/tags/**"
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
@ -328,10 +328,10 @@ steps:
|
||||||
auto_tag_suffix: linux-arm
|
auto_tag_suffix: linux-arm
|
||||||
build_args:
|
build_args:
|
||||||
- USE_RELEASE=true
|
- USE_RELEASE=true
|
||||||
- RELEASE_VERSION=master
|
- RELEASE_VERSION=unstable
|
||||||
when:
|
when:
|
||||||
ref:
|
ref:
|
||||||
- refs/heads/master
|
- refs/heads/main
|
||||||
depends_on:
|
depends_on:
|
||||||
- clone
|
- clone
|
||||||
|
|
||||||
|
@ -368,10 +368,10 @@ steps:
|
||||||
auto_tag_suffix: linux-arm64
|
auto_tag_suffix: linux-arm64
|
||||||
build_args:
|
build_args:
|
||||||
- USE_RELEASE=true
|
- USE_RELEASE=true
|
||||||
- RELEASE_VERSION=master
|
- RELEASE_VERSION=unstable
|
||||||
when:
|
when:
|
||||||
ref:
|
ref:
|
||||||
- refs/heads/master
|
- refs/heads/main
|
||||||
depends_on:
|
depends_on:
|
||||||
- clone
|
- clone
|
||||||
|
|
||||||
|
@ -410,7 +410,7 @@ depends_on:
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
ref:
|
ref:
|
||||||
- refs/heads/master
|
- refs/heads/main
|
||||||
- "refs/tags/**"
|
- "refs/tags/**"
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
@ -427,10 +427,10 @@ steps:
|
||||||
auto_tag_suffix: linux-amd64
|
auto_tag_suffix: linux-amd64
|
||||||
build_args:
|
build_args:
|
||||||
- USE_RELEASE=true
|
- USE_RELEASE=true
|
||||||
- RELEASE_VERSION=master
|
- RELEASE_VERSION=unstable
|
||||||
when:
|
when:
|
||||||
ref:
|
ref:
|
||||||
- refs/heads/master
|
- refs/heads/main
|
||||||
|
|
||||||
- name: docker-version
|
- name: docker-version
|
||||||
image: plugins/docker:linux-amd64
|
image: plugins/docker:linux-amd64
|
||||||
|
@ -457,7 +457,7 @@ name: docker-manifest
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
ref:
|
ref:
|
||||||
- refs/heads/master
|
- refs/heads/main
|
||||||
- "refs/tags/**"
|
- "refs/tags/**"
|
||||||
|
|
||||||
depends_on:
|
depends_on:
|
||||||
|
@ -484,7 +484,7 @@ name: notify
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
ref:
|
ref:
|
||||||
- refs/heads/master
|
- refs/heads/main
|
||||||
- "refs/tags/**"
|
- "refs/tags/**"
|
||||||
|
|
||||||
depends_on:
|
depends_on:
|
||||||
|
|
|
@ -4,7 +4,7 @@ FROM node:13.14.0 AS compile-image
|
||||||
WORKDIR /build
|
WORKDIR /build
|
||||||
|
|
||||||
ARG USE_RELEASE=false
|
ARG USE_RELEASE=false
|
||||||
ARG RELEASE_VERSION=master
|
ARG RELEASE_VERSION=main
|
||||||
|
|
||||||
ENV YARN_CACHE_FOLDER .cache/yarn/
|
ENV YARN_CACHE_FOLDER .cache/yarn/
|
||||||
COPY . ./
|
COPY . ./
|
||||||
|
|
Loading…
Reference in a new issue