Use main instead of master as branch name

Use updated branch names. Signed-off-by: Davide Bettio <[email protected]>
atomvm · Feb 17, 2024 · db68327 · db68327
1 parent 2661c36
commit db68327
Show file tree

Hide file tree

Showing 21 changed files with 35 additions and 35 deletions.
diff --git a/.github/workflows/build-and-test-macos.yaml b/.github/workflows/build-and-test-macos.yaml
@@ -29,7 +29,7 @@ on:
       - '*.md'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/master' && github.ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/main' && github.ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/build-and-test-on-freebsd.yaml b/.github/workflows/build-and-test-on-freebsd.yaml
@@ -29,7 +29,7 @@ on:
       - '*.md'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/master' && github.ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/main' && github.ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/build-and-test-other.yaml b/.github/workflows/build-and-test-other.yaml
@@ -29,7 +29,7 @@ on:
       - '*.md'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/master' && github.ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/main' && github.ref || github.run_id }}
   cancel-in-progress: true
 
 env:

diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
@@ -29,7 +29,7 @@ on:
       - '*.md'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/master' && github.ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/main' && github.ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/build-docs.yaml b/.github/workflows/build-docs.yaml
@@ -10,12 +10,12 @@ name: Build Docs
 
 # Controls when the workflow will run
 on:
-  # Triggers the workflow on push request and tag events on master branch
+  # Triggers the workflow on push request and tag events on main branch
   pull_request:
     tag:
       - '**'
     branches:
-      - 'master'
+      - 'main'
     paths:
       - '.github/workflows/**'
       - 'CMakeLists.txt'
@@ -36,7 +36,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/master' && github.ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/main' && github.ref || github.run_id }}
   cancel-in-progress: true
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel

diff --git a/.github/workflows/check-formatting.yaml b/.github/workflows/check-formatting.yaml
@@ -23,7 +23,7 @@ on:
       - '**/*.erl'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/master' && github.ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/main' && github.ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml
@@ -33,7 +33,7 @@ on:
     - cron: '45 18 * * 5'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/master' && github.ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/main' && github.ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/esp32-build.yaml b/.github/workflows/esp32-build.yaml
@@ -22,7 +22,7 @@ on:
       - 'src/libAtomVM/**'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/master' && github.ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/main' && github.ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/esp32-mkimage.yaml b/.github/workflows/esp32-mkimage.yaml
@@ -25,7 +25,7 @@ permissions:
   contents: write
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/master' && github.ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/main' && github.ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/pico-build.yaml b/.github/workflows/pico-build.yaml
@@ -26,7 +26,7 @@ permissions:
   contents: write
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/master' && github.ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/main' && github.ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/publish-docs.yaml b/.github/workflows/publish-docs.yaml
@@ -10,12 +10,12 @@ name: Publish Docs
 
 # Controls when the workflow will run
 on:
-  # Triggers the workflow on pull request, tag events and pushes on master
+  # Triggers the workflow on pull request, tag events and pushes on main
   push:
     tags:
       - '**'
     branches:
-      - 'master'
+      - 'main'
     paths:
       - '.github/workflows/publish-docs.yaml'
       - 'CMakeLists.txt'

diff --git a/.github/workflows/reuse-lint.yaml b/.github/workflows/reuse-lint.yaml
@@ -7,7 +7,7 @@ name: REUSE Compliance Check
 on: [push, pull_request]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/master' && github.ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/main' && github.ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/run-tests-with-beam.yaml b/.github/workflows/run-tests-with-beam.yaml
@@ -29,7 +29,7 @@ on:
       - '*.md'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/master' && github.ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/main' && github.ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/stm32-build.yaml b/.github/workflows/stm32-build.yaml
@@ -21,7 +21,7 @@ on:
       - 'src/libAtomVM/**'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/master' && github.ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/main' && github.ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/wasm-build.yaml b/.github/workflows/wasm-build.yaml
@@ -26,7 +26,7 @@ permissions:
   contents: write
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/master' && github.ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.ref != 'refs/heads/main' && github.ref || github.run_id }}
   cancel-in-progress: true
 
 env:

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -169,7 +169,7 @@ C source modules (`.c`) should be organized as follows:
 
 #### Documentation
 
-[Doxygen Javadoc style](https://www.doxygen.nl/manual/docblocks.html) code comments will be picked up and added to the documentation. Changes will automatically be added to the [libAtomVM Source Files](https://www.atomvm.net/doc/master/c_api_docs.html#libatomvm-source-files) and the [libAtomVM Index](https://www.atomvm.net/doc/master/apidocs/libatomvm/index.html#libatomvm-index). But to have `Data Structures`, `Types`, `MACROS`, and `Functions` appear in the correct C Library APIs section the corresponding entries must be added to the similarly named `*.rst` files in the `AtomVM/doc/src/apidocs/libatomvm/` directory. The exact names of the files that need to be altered are: `data_structures.rst`, `functions.rst`, `macros.rst`, and `types.rst`. The other files in the directory handle auto`generated content and do not need to be altered.
+[Doxygen Javadoc style](https://www.doxygen.nl/manual/docblocks.html) code comments will be picked up and added to the documentation. Changes will automatically be added to the [libAtomVM Source Files](https://www.atomvm.net/doc/main/c_api_docs.html#libatomvm-source-files) and the [libAtomVM Index](https://www.atomvm.net/doc/main/apidocs/libatomvm/index.html#libatomvm-index). But to have `Data Structures`, `Types`, `MACROS`, and `Functions` appear in the correct C Library APIs section the corresponding entries must be added to the similarly named `*.rst` files in the `AtomVM/doc/src/apidocs/libatomvm/` directory. The exact names of the files that need to be altered are: `data_structures.rst`, `functions.rst`, `macros.rst`, and `types.rst`. The other files in the directory handle auto`generated content and do not need to be altered.
 
 In the rare case that a function declaration and definition are both in different header files (rather than the definition in a `*.c` file) this can cause rendering errors for `Doxygen`. The work around for these cases can be demonstrated with this example for the function `sys_listener_destroy` it is documented and declared in `sys.h` and defined as follows in `listeners.h`:
 

diff --git a/README.Md b/README.Md
@@ -27,10 +27,10 @@ might be supported in a near future.
 Getting Started
 ===============
 There is much more information, including a more complete
-["Getting Started Guide"](https://www.atomvm.net/doc/master/getting-started-guide.html),
-[extensive documentation](https://www.atomvm.net/doc/master/build-instructions.html),
+["Getting Started Guide"](https://www.atomvm.net/doc/main/getting-started-guide.html),
+[extensive documentation](https://www.atomvm.net/doc/main/build-instructions.html),
 [examples](https://www.atomvm.net/sample-code),
-detailed [build instructions](https://www.atomvm.net/doc/master/build-instructions.html),
+detailed [build instructions](https://www.atomvm.net/doc/main/build-instructions.html),
 and [contact information](https://www.atomvm.net/contact) available on the
 [AtomVM](https://atomvm.net) project website.
 
@@ -74,19 +74,19 @@ $ ./src/AtomVM ./tests/libs/eavmlib/test_eavmlib.avm
 $ ./src/AtomVM ./tests/libs/alisp/test_alisp.avm
 ```
 
-Complete [Build Instructions](https://www.atomvm.net/doc/master/build-instructions.html) are
+Complete [Build Instructions](https://www.atomvm.net/doc/main/build-instructions.html) are
 available in the documentation for
-[Generic UNIX](https://www.atomvm.net/doc/master/build-instructions.html) (Linux, MacOS, FreeBSD),
-[ESP32](https://www.atomvm.net/doc/master/build-instructions.html#building-for-esp32),
-[STM32](https://www.atomvm.net/doc/master/build-instructions.html#building-for-stm32),
-[Raspberry Pi Pico](https://www.atomvm.net/doc/master/build-instructions.html#building-for-raspberry-pi-pico)
+[Generic UNIX](https://www.atomvm.net/doc/main/build-instructions.html) (Linux, MacOS, FreeBSD),
+[ESP32](https://www.atomvm.net/doc/main/build-instructions.html#building-for-esp32),
+[STM32](https://www.atomvm.net/doc/main/build-instructions.html#building-for-stm32),
+[Raspberry Pi Pico](https://www.atomvm.net/doc/main/build-instructions.html#building-for-raspberry-pi-pico)
 (rp2040), and
-[WASM](https://www.atomvm.net/doc/master/build-instructions.html#building-for-nodejs-web) (NodeJS/Web).
+[WASM](https://www.atomvm.net/doc/main/build-instructions.html#building-for-nodejs-web) (NodeJS/Web).
 
 Project Status
 ==============
 
-[![Build and Test](https://github.com/atomvm/AtomVM/actions/workflows/build-and-test.yaml/badge.svg?branch=master)](https://github.com/atomvm/AtomVM/actions/workflows/build-and-test.yaml)
+[![Build and Test](https://github.com/atomvm/AtomVM/actions/workflows/build-and-test.yaml/badge.svg?branch=main)](https://github.com/atomvm/AtomVM/actions/workflows/build-and-test.yaml)
 
 AtomVM is still in its early stages, but it can run simple applications similar to those available
 in [examples](examples/) and [tests](tests/).

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -46,8 +46,8 @@ add_custom_target(edown-escript
     COMMENT "Preparing edown escript" VERBATIM
 )
 
-# Get the version tree name, tag if this is a tagged commit, otherwise master.
-execute_process(COMMAND "bash" "-c" "tag=$(git for-each-ref --points-at=HEAD --format='%(refname:lstrip=2)' refs/tags); ( [ $tag ] && echo $tag ) || echo 'master'"
+# Get the version tree name, tag if this is a tagged commit, otherwise main.
+execute_process(COMMAND "bash" "-c" "tag=$(git for-each-ref --points-at=HEAD --format='%(refname:lstrip=2)' refs/tags); ( [ $tag ] && echo $tag ) || echo 'main'"
                 OUTPUT_VARIABLE
                 DOC_TREE_VERSION
                 OUTPUT_STRIP_TRAILING_WHITESPACE )

diff --git a/doc/conf.py.in b/doc/conf.py.in
@@ -166,11 +166,11 @@ versions = list()
 for tag in tag_list:
     versions.append(tag.name)
 
-versions.append('master')
+versions.append('main')
 if ((repo.head.object.hexsha) == (latest_tag.commit.hexsha)):
     current_version = latest_tag.name
 else:
-    current_version = 'master'
+    current_version = 'main'
 
 print("Sphinx config found documentation candidates: %r." % (versions))
 print("Sphinx config current version: %r." % (current_version))

diff --git a/doc/src/atomvm-tooling.md b/doc/src/atomvm-tooling.md
@@ -246,7 +246,7 @@ To create an AtomVM packbeam file (ending in `.avm`), first use the `mix.deps` t
     remote: Counting objects: 100% (17/17), done.
     remote: Compressing objects: 100% (10/10), done.
     remote: Total 17 (delta 6), reused 16 (delta 6), pack-reused 0
-    origin/HEAD set to master
+    origin/HEAD set to main
 
 You can now use the `atomvm.packbeam` target to create a packbeam (ending in `.avm`) file:
 

diff --git a/tools/test/smoke-test/README.md b/tools/test/smoke-test/README.md
@@ -151,7 +151,7 @@ Your ESP32 device is now flashed with the ESP32 image you specified.
 
 The [`atomvm_examples`](https://github.com/atomvm/atomvm_examples) repo is a good place to start smoke testing.  We assume you know how to clone this repo using git.
 
-Note that you will need a supported OTP version and at least a recent version of the [rebar3](https://rebar3.org) tool.  If you want to smoke test Elixir programs, you should also have a comaptible version of the Elixir compiler and runtime available.  Consult the AtomVM [Relaase Notes](https://www.atomvm.net/doc/master/release-notes.html) for compatibility information.
+Note that you will need a supported OTP version and at least a recent version of the [rebar3](https://rebar3.org) tool.  If you want to smoke test Elixir programs, you should also have a comaptible version of the Elixir compiler and runtime available.  Consult the AtomVM [Relaase Notes](https://www.atomvm.net/doc/main/release-notes.html) for compatibility information.
 
 To run an example program, `cd` into the appropriate example directory, and build and flash the program.  We will show an example with the [`hello_world`](https://github.com/atomvm/atomvm_examples/tree/master/erlang/hello_world) program.