Skip to content

Commit

Permalink
removing final references to the word master (#390)
Browse files Browse the repository at this point in the history
  • Loading branch information
IsmaelMartinez committed Sep 29, 2020
1 parent 6959de4 commit 7649cac
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# These are supported funding model platforms

custom: ['paypal.me/ismaelmartinezramos']
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
custom: ["paypal.me/ismaelmartinezramos"]
github: ["ismaelmartinez"]
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: ismaelmartinezramos
ko_fi: ismaelmartinezramos
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
Expand Down
16 changes: 7 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ name: Build & Release
env:
GH_TOKEN: ${{ SECRETS.GITHUB_TOKEN }}

on:
push
on: push

defaults:
run:
Expand All @@ -27,7 +26,7 @@ jobs:
run: yarn --link-duplicates --pure-lockfile

- name: Release
if: contains(github.ref, 'develop') || contains(github.ref, 'master')
if: contains(github.ref, 'develop')
run: yarn dist:linux:deb

rpm:
Expand All @@ -46,7 +45,7 @@ jobs:
run: yarn --link-duplicates --pure-lockfile

- name: Release
if: contains(github.ref, 'develop') || contains(github.ref, 'master')
if: contains(github.ref, 'develop')
run: yarn dist:linux:rpm

appimage:
Expand All @@ -65,7 +64,7 @@ jobs:
run: yarn --link-duplicates --pure-lockfile

- name: Release
if: contains(github.ref, 'develop') || contains(github.ref, 'master')
if: contains(github.ref, 'develop')
run: yarn dist:linux:appimage

targz:
Expand All @@ -84,7 +83,7 @@ jobs:
run: yarn --link-duplicates --pure-lockfile

- name: Release
if: contains(github.ref, 'develop') || contains(github.ref, 'master')
if: contains(github.ref, 'develop')
run: yarn dist:linux:targz

snap:
Expand All @@ -108,7 +107,7 @@ jobs:
run: yarn --link-duplicates --pure-lockfile

- name: Release
if: contains(github.ref, 'develop') || contains(github.ref, 'master')
if: contains(github.ref, 'develop')
run: yarn dist:linux:snap

snap-armv7l:
Expand All @@ -132,6 +131,5 @@ jobs:
run: yarn --link-duplicates --pure-lockfile

- name: Release
if: contains(github.ref, 'develop') || contains(github.ref, 'master')
if: contains(github.ref, 'develop')
run: yarn dist:linux:snap:armv7l

6 changes: 4 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This is a fairly small project. IMO, the ideal size for getting started with ele

Just fork the repo and dive in. The app/index.js is the starting of all the application.

Once changes are made, just do a pull request to develop.
Once changes are made, just do a pull request in a branch of develop.

Each subfolder has a README.md file that explains the reason of existence and any extra required information.

Expand Down Expand Up @@ -69,4 +69,6 @@ sudo snap install teams-for-linux

## Version number

We are following SemVer at the moment. The lower number in master will be increased after a release (basically, to avoid re-releasing stuff with some changes), but release number will be decided just before a release trying to use SemVer standards.
We are following SemVer at the moment. The lower number in develop will be increased after a release.

Decide the release number before merging to develop following SemVer.

0 comments on commit 7649cac

Please sign in to comment.