Skip to content

Commit b3deb2f

Browse files
Akos Kittakittaakos
Akos Kitta
authored andcommitted
Aligned workflow/docs with the default branch name
This is required after switching the default from `master` to `main`. Signed-off-by: Akos Kitta <[email protected]>
1 parent b2641f5 commit b3deb2f

File tree

4 files changed

+11
-35
lines changed

4 files changed

+11
-35
lines changed

Diff for: .github/workflows/build.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ name: Arduino IDE
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
tags:
88
- '[0-9]+.[0-9]+.[0-9]+*'
99
workflow_dispatch:
1010
pull_request:
1111
branches:
12-
- master
12+
- main
1313
schedule:
1414
- cron: '0 3 * * *' # run every day at 3AM (https://docs.github.com/en/actions/reference/events-that-trigger-workflows#scheduled-events-schedule)
1515

@@ -48,7 +48,7 @@ jobs:
4848
AC_PASSWORD: ${{ secrets.AC_PASSWORD }}
4949
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
5050
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
51-
IS_NIGHTLY: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/master') }}
51+
IS_NIGHTLY: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main') }}
5252
IS_RELEASE: ${{ startsWith(github.ref, 'refs/tags/') }}
5353
run: |
5454
# See: https://www.electron.build/code-signing
@@ -112,15 +112,15 @@ jobs:
112112
echo "$BODY" > CHANGELOG.txt
113113
114114
- name: Upload Changelog [GitHub Actions]
115-
if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/master')
115+
if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main')
116116
uses: actions/upload-artifact@v2
117117
with:
118118
name: build-artifacts
119119
path: CHANGELOG.txt
120120

121121
publish:
122122
needs: changelog
123-
if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/master')
123+
if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main')
124124
runs-on: ubuntu-latest
125125
steps:
126126
- name: Download [GitHub Actions]

Diff for: .gitpod.yml

-24
This file was deleted.

Diff for: README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ These are available from the [GitHub releases page](https://github.com/arduino/a
2828

2929
#### Nightly builds
3030

31-
These builds are generated every day at 03:00 GMT from the `master` branch and
31+
These builds are generated every day at 03:00 GMT from the `main` branch and
3232
should be considered unstable. In order to get the latest nightly build
3333
available for the supported platform, use the following links:
3434

@@ -75,8 +75,8 @@ yarn start
7575

7676
This project is built on [GitHub Actions](https://github.com/bcmi-labs/arduino-editor/actions?query=workflow%3A%22Arduino+Pro+IDE%22).
7777

78-
- _Snapshot_ builds run when changes are pushed to the `master` branch, or when a PR is created against the `master` branch. For the sake of the review and verification process, the build artifacts can be downloaded from the GitHub Actions page. Note: [due to a limitation](https://github.com/actions/upload-artifact/issues/80#issuecomment-630030144) with the GH Actions UI, you cannot download a particular build, but you have to get all together inside the `build-artifacts.zip`.
79-
- _Nightly_ builds run every day at 03:00 GMT from the `master` branch.
78+
- _Snapshot_ builds run when changes are pushed to the `main` branch, or when a PR is created against the `main` branch. For the sake of the review and verification process, the build artifacts can be downloaded from the GitHub Actions page. Note: [due to a limitation](https://github.com/actions/upload-artifact/issues/80#issuecomment-630030144) with the GH Actions UI, you cannot download a particular build, but you have to get all together inside the `build-artifacts.zip`.
79+
- _Nightly_ builds run every day at 03:00 GMT from the `main` branch.
8080
- _Release_ builds run when a new tag is pushed to the remote. The tag must follow the [semver](https://semver.org/). For instance, `1.2.3` is a correct tag, but `v2.3.4` won't work. Steps to trigger a new release build:
8181
- Create a local tag:
8282
```sh
@@ -90,7 +90,7 @@ This project is built on [GitHub Actions](https://github.com/bcmi-labs/arduino-e
9090
### Creating a GH release
9191
This section guides you through how to create a new release. Let's assume the current version is `0.1.3` and you want to release `0.2.0`.
9292
93-
- Make sure the `master` state represents what you want to release and you're on `master`.
93+
- Make sure the `main` state represents what you want to release and you're on `main`.
9494
- Prepare a release-candidate build on a branch:
9595
```bash
9696
git branch 0.2.0-rc \
@@ -108,7 +108,7 @@ git add . \
108108
&& git push
109109
```
110110
- Create the GH PR the workflow starts automatically.
111-
- Once you're happy with the RC, merge the changes to the `master`.
111+
- Once you're happy with the RC, merge the changes to the `main`.
112112
- Create a tag and push it:
113113
```bash
114114
git tag -a 0.2.0 -m "0.2.0" \

Diff for: electron/packager/config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ function currentCommitish() {
9797

9898
function generateTemplate(buildDate) {
9999
// do `export PUBLISH=true yarn package` if you want to mimic CI build locally.
100-
// const electronPublish = release || (isCI && currentBranch() === 'master') || process.env.PUBLISH === 'true';
100+
// const electronPublish = release || (isCI && currentBranch() === 'main') || process.env.PUBLISH === 'true';
101101
const version = getVersion();
102102
const productName = 'Arduino IDE';
103103
const name = 'arduino-ide';

0 commit comments

Comments
 (0)