Skip to content

Commit

Permalink
moving from develop to main as it is a more standard naming of the ma…
Browse files Browse the repository at this point in the history
…in branch'
  • Loading branch information
IsmaelMartinez committed Oct 27, 2024
1 parent c072ec5 commit 884f4df
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: npm ci

- name: Release
if: contains(github.ref, 'develop')
if: contains(github.ref, 'main')
run: npm run dist:linux:x64 -- --publish always

linux_arm64:
Expand All @@ -45,7 +45,7 @@ jobs:
run: npm ci

- name: Release
if: contains(github.ref, 'develop')
if: contains(github.ref, 'main')
run: npm run dist:linux:arm64 -- --publish always

linux_arm:
Expand All @@ -64,7 +64,7 @@ jobs:
run: npm ci

- name: Release
if: contains(github.ref, 'develop')
if: contains(github.ref, 'main')
run: npm run dist:linux:arm -- --publish always

dmg:
Expand All @@ -83,7 +83,7 @@ jobs:
run: npm ci

- name: Release
if: contains(github.ref, 'develop')
if: contains(github.ref, 'main')
run: npm run dist:mac:x64 -- --publish always

exe:
Expand All @@ -102,5 +102,5 @@ jobs:
run: npm ci

- name: Release
if: contains(github.ref, 'develop')
if: contains(github.ref, 'main')
run: npm run dist:windows -- --publish always
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: "CodeQL"

on:
push:
branches: [develop]
branches: [main]
pull_request:
# The branches below must be a subset of the branches above
branches: [develop]
branches: [main]
schedule:
- cron: '0 17 * * 6'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/snap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
run: npm ci

- name: Release
if: contains(github.ref, 'develop')
if: contains(github.ref, 'main')
run: npm run dist:linux:snap -- --publish always

snap-armv7l:
Expand All @@ -55,5 +55,5 @@ jobs:
run: npm ci

- name: Release
if: contains(github.ref, 'develop')
if: contains(github.ref, 'main')
run: npm run dist:linux:snap:armv7l -- --publish always
4 changes: 2 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, making it ideal for getting started with Electro

To contribute, fork the repository and make your changes. The starting point of the application is `app/index.js`.

After making your changes, submit a pull request to the `develop` branch.
After making your changes, submit a pull request to the `main` branch.

Each subfolder contains a `README.md` file that provides additional information and explains the purpose of the folder.

Expand Down Expand Up @@ -77,7 +77,7 @@ sudo snap install teams-for-linux

## Release process

The release is mostly automated using GitHub Actions. The release is triggered by merging to develop.
The release is mostly automated using GitHub Actions. The release is triggered by merging to main.

### Versioning

Expand Down
2 changes: 1 addition & 1 deletion com.github.IsmaelMartinez.teams_for_linux.appdata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<p>This application is an unofficial client for Microsoft Teams.</p>
</description>
<url type="homepage">https://github.com/IsmaelMartinez/teams-for-linux</url>
<url type="help">https://github.com/IsmaelMartinez/teams-for-linux/blob/develop/KNOWN_ISSUES.md</url>
<url type="help">https://github.com/IsmaelMartinez/teams-for-linux/blob/main/KNOWN_ISSUES.md</url>
<url type="bugtracker">https://github.com/IsmaelMartinez/teams-for-linux/issues</url>
<launchable type="desktop-id">com.github.IsmaelMartinez.teams_for_linux.desktop</launchable>
<releases>
Expand Down

0 comments on commit 884f4df

Please sign in to comment.