Merge branch 'topic/rm_edge' into 'master'

Don't use `edge` branch to build ALS on GitHub

See merge request eng/ide/ada_language_server!2156

Author: reznikmm

.github/workflows/build-binaries.yml

@@ -47,10 +47,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Fetch edge branch (for scheduled build only)
-        shell: bash
-        if: github.event.schedule
-        run: git checkout edge
       - name: Get GNAT toolchain with alire
         shell: bash
         run: |

.github/workflows/pack-binaries.sh

@@ -32,8 +32,8 @@ create_changelog >"$ext_dir/CHANGELOG.md"
    # digit of the version:
    #  0 --> pre-release
    #  1 -->     release
-   #  2 --> pre-release (based on edge branch)
-   #  3 -->     release (based on edge branch)
+   #  2 --> pre-release (based on master branch in edge mode)
+   #  3 -->     release (based on master branch in edge mode)
    case "$TAG" in
    *1 | *3)
       pre_release=""

README.md

@@ -5,7 +5,7 @@
 [![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/AdaCore/ada_language_server)](https://github.com/AdaCore/ada_language_server/releases)
 [![VS Marketplace](https://img.shields.io/visual-studio-marketplace/v/adacore.ada?label=VS%20Marketplace)](https://marketplace.visualstudio.com/items?itemName=AdaCore.ada)
 [![Open VSX Registry](https://img.shields.io/open-vsx/v/AdaCore/ada?label=Open%20VSX)](https://open-vsx.org/extension/AdaCore/ada)
-[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/AdaCore/ada_language_server/tree/edge)
+[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/AdaCore/ada_language_server/)
 
 This repository contains an implementation of the [Microsoft Language Server Protocol](https://microsoft.github.io/language-server-protocol/)
 for Ada/SPARK and GPR project files.

doc/devel/HACKING.md

@@ -152,7 +152,7 @@ To release a new version of the VS Code extension, just put a tag with of the fo
 `22.0.3`, where `22.0` matches the current GNAT Studio development version. The
 corresponding `git` command is
 ```
-   git checkout edge
+   git checkout master
    git tag -a 22.0.3
 ```
 

doc/devel/build.md

@@ -15,7 +15,7 @@
        cd ada_language_server
 
 1. If you know dependency commits numbers then create `deps.txt` file
-   with lines `<repo_name>=commit`. Otherwise checkout `edge` branch.
+   with lines `<repo_name>=commit`. Otherwise checkout `master` branch.
 
 1. Use `alr toolchain --select` to install the latest available versions of `gnat` and `gprbuild`.
 

doc/refactoring_tools.md

@@ -247,7 +247,7 @@ Demo source is `replace_type/` in [Code Samples](https://github.com/AdaCore/ada_
 
 * For an unresolved name, suggests all packages that can be imported and prefix to be added so that that the name gets resolved.
 
-[Source](https://github.com/AdaCore/lal-refactor/blob/edge/src/lal_refactor-auto_import.adb` in [LAL Refactor repository](https://github.com/AdaCore/lal-refactor).
+[Source](https://github.com/AdaCore/lal-refactor/blob/main/src/lal_refactor-auto_import.adb` in [LAL Refactor repository](https://github.com/AdaCore/lal-refactor).
 
 Demo source is `auto_import/` in [Code Samples](https://github.com/AdaCore/ada_language_server/blob/master/integration/vscode/Code%20Samples/refactoring_demos/).
 

integration/vscode/ada/README.md

@@ -7,7 +7,7 @@
 [![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/AdaCore/ada_language_server)](https://github.com/AdaCore/ada_language_server/releases)
 [![VS Marketplace](https://img.shields.io/visual-studio-marketplace/v/adacore.ada?label=VS%20Marketplace)](https://marketplace.visualstudio.com/items?itemName=AdaCore.ada)
 [![Open VSX Registry](https://img.shields.io/open-vsx/v/AdaCore/ada?label=Open%20VSX)](https://open-vsx.org/extension/AdaCore/ada)
-[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/AdaCore/ada_language_server/tree/edge)
+[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/AdaCore/ada_language_server/)
 
 This extension provides support for the Ada and SPARK programming languages in VS Code via the [Ada Language Server](https://github.com/AdaCore/ada_language_server) based on the [Libadalang library](https://github.com/AdaCore/libadalang).
 

scripts/build_als.sh

@@ -62,9 +62,8 @@ repo_xdiff=xdiff
 
 # Pins branches (master by default)
 
-branch_gnatdoc=edge
-branch_lal_refactor=edge
-branch_gnatformat=edge
+branch_lal_refactor=main
+branch_gnatformat=main
 branch_libgpr2=main
 branch_prettier_ada=main
 branch_vss_text=main