Skip to content

Commit 72e8b50

Browse files
committed
U308-038 Replace BinTray with AWS S3
1 parent 9afdb54 commit 72e8b50

File tree

4 files changed

+35
-54
lines changed

4 files changed

+35
-54
lines changed

.github/workflows/build-binaries.sh

+6-8
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,12 @@ if [[ ${GITHUB_REF##*/} != 2*.[0-9]*.[0-9]* ]]; then
3030
git rebase --verbose origin/edge
3131
fi
3232

33+
# Get libadalang binaries
3334
mkdir -p $prefix
34-
URL=https://bintray.com/reznikmm/libadalang/download_file\?file_path=libadalang-$RUNNER_OS-$BRANCH${DEBUG:+-dbg}-static.tar.gz
35-
curl -L $URL | tar xzf - -C $prefix
35+
FILE=libadalang-$RUNNER_OS-$BRANCH${DEBUG:+-dbg}-static.tar.gz
36+
aws s3 cp s3://adacore-gha-tray-eu-west-1/libadalang/$FILE . --sse=AES256
37+
tar xzf $FILE -C $prefix
38+
rm -f -v $FILE
3639
gprinstall --uninstall gnatcoll || true
3740
gprinstall --uninstall gpr || true
3841
rm -f -v gnat/spawn*.gpr
@@ -58,14 +61,9 @@ function fix_rpath ()
5861
install_name_tool -add_rpath @executable_path $1
5962
}
6063

61-
if [ $RUNNER_OS = Windows ]; then
62-
tar czvf $RUNNER_OS${DEBUG:+-dbg}-$TAG.tar.gz -C integration/vscode/ada/ win32
63-
elif [ $RUNNER_OS = macOS ]; then
64+
if [ $RUNNER_OS = macOS ]; then
6465
cp -v /usr/local/opt/gmp/lib/libgmp.10.dylib integration/vscode/ada/darwin/
6566
fix_rpath integration/vscode/ada/darwin/ada_language_server
66-
tar czvf $RUNNER_OS${DEBUG:+-dbg}-$TAG.tar.gz -C integration/vscode/ada/ darwin
67-
else
68-
tar czvf $RUNNER_OS${DEBUG:+-dbg}-$TAG.tar.gz -C integration/vscode/ada/ linux
6967
fi
7068

7169
if [ "$DEBUG" != "debug" ]; then

.github/workflows/build-binaries.yml

+11-22
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
name: Build binaries
99
env:
1010
DEFAULT_TAG: 22.0.999
11+
AWS_DEFAULT_REGION: eu-west-1
1112
jobs:
1213
build:
1314
name: Build and deploy
@@ -72,13 +73,19 @@ jobs:
7273
- name: Build (Windows)
7374
if: ${{ runner.os == 'Windows' }}
7475
shell: msys2 {0}
76+
env:
77+
AWS_ACCESS_KEY_ID: ${{secrets.GHA_CACHE_ACCESS_KEY_ID}}
78+
AWS_SECRET_ACCESS_KEY: ${{secrets.GHA_CACHE_SECRET}}
7579
run: |
7680
# drop python if any
7781
rm -rf -v ./cached_gnat/gnat*/bin/python*
7882
# This is to avoid locking .sh on win that prevents its updating
7983
cp .github/workflows/build-binaries.sh .github/workflows/build-binaries.sh_
8084
.github/workflows/build-binaries.sh_ "${{ matrix.debug }}" ${{ runner.os }} ${{ env.TAG }}
8185
- name: Build (non-Windows)
86+
env:
87+
AWS_ACCESS_KEY_ID: ${{secrets.GHA_CACHE_ACCESS_KEY_ID}}
88+
AWS_SECRET_ACCESS_KEY: ${{secrets.GHA_CACHE_SECRET}}
8289
if: ${{ runner.os != 'Windows' }}
8390
run: .github/workflows/build-binaries.sh "${{ matrix.debug }}" ${{ runner.os }} ${{ env.TAG }}
8491
- name: Archive ALS binary
@@ -87,18 +94,6 @@ jobs:
8794
with:
8895
name: als-${{ runner.os }}-${{ matrix.debug }}
8996
path: integration/vscode/ada/[ldw]*/*
90-
- name: Upload tar-ball to Bintray
91-
if: ${{ github.event_name == 'push' }}
92-
uses: reznikmm/upload-bintray-action@v4
93-
with:
94-
subject: reznikmm
95-
username: reznikmm
96-
repository: ada-language-server
97-
package: ada-language-server
98-
version: ${{ env.TAG }}
99-
sourcePath: '*.tar.gz'
100-
override: 1
101-
apiKey: ${{secrets.BINTRAY_API_KEY}}
10297
package:
10398
if: ${{ github.event_name == 'push' }}
10499
needs: build
@@ -118,14 +113,8 @@ jobs:
118113
echo "TAG=$TAG" >> $GITHUB_ENV
119114
.github/workflows/pack-binaries.sh "" "${{secrets.VSCE_TOKEN}}" "${{secrets.OPENVSX_TOKEN}}" $TAG
120115
.github/workflows/pack-binaries.sh "debug" "${{secrets.VSCE_TOKEN}}" "${{secrets.OPENVSX_TOKEN}}" $TAG
121-
- name: Upload vsix to Bintray
122-
uses: reznikmm/upload-bintray-action@v4
116+
- name: Archive ALS vsix
117+
uses: actions/upload-artifact@v2
123118
with:
124-
subject: reznikmm
125-
username: reznikmm
126-
repository: ada-language-server
127-
package: ada-language-server
128-
version: ${{ env.TAG }}
129-
sourcePath: '*.vsix'
130-
override: 1
131-
apiKey: ${{secrets.BINTRAY_API_KEY}}
119+
name: als-vsix-${{ matrix.debug }}${{ env.TAG }}
120+
path: '*.vsix'

README.md

+12-22
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
# Ada Language Server
33

44
[![Build binaries](https://github.com/AdaCore/ada_language_server/workflows/Build%20binaries/badge.svg)](https://github.com/AdaCore/ada_language_server/actions)
5-
[![Download](https://api.bintray.com/packages/reznikmm/ada-language-server/ada-language-server/images/download.svg) ](https://bintray.com/reznikmm/ada-language-server/ada-language-server/_latestVersion)
5+
[![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/AdaCore/ada_language_server)](https://github.com/AdaCore/ada_language_server/releases)
6+
[![VS Marketplace](https://img.shields.io/visual-studio-marketplace/v/adacore.ada?label=VS%20Marketplace)](https://marketplace.visualstudio.com/items?itemName=AdaCore.ada)
7+
[![Open VSX Registry](https://img.shields.io/open-vsx/v/AdaCore/ada?label=Open%20VSX)](https://open-vsx.org/extension/AdaCore/ada)
68
[![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)
79

810
This repository contains an implementation of the [Microsoft Language Server Protocol](https://microsoft.github.io/language-server-protocol/)
@@ -17,9 +19,9 @@ Current features:
1719
* Code folding and formatting.
1820

1921
We also provide [Visual Studio Code](https://code.visualstudio.com/)
20-
extension
21-
[at the Marketplace](https://marketplace.visualstudio.com/items?itemName=AdaCore.ada) and
22-
[the latest build as .vsix file](https://dl.bintray.com/reznikmm/ada-language-server/ada-22.0.999.vsix).
22+
extension at
23+
[the VS Marketplace](https://marketplace.visualstudio.com/items?itemName=AdaCore.ada) and at
24+
[the Open VSX Registry](https://open-vsx.org/extension/AdaCore/ada).
2325

2426
## Table of Contents
2527
* [Install](#Install)
@@ -42,21 +44,8 @@ extension
4244

4345
## Install
4446

45-
You can install
46-
[binary image](https://bintray.com/reznikmm/ada-language-server/ada-language-server#files)
47-
or build language server from sources.
48-
49-
To install binary image download an archive corresponding to your OS and unpack it
50-
somewhere. You will find `ada_language_server` inside unpacked folder.
51-
We provide binaries for
52-
* Linux x86_64 - take
53-
[linux.tar.gz](https://dl.bintray.com/reznikmm/ada-language-server/linux-latest.tar.gz)
54-
* Window 64 bit - take
55-
[win32.zip](https://dl.bintray.com/reznikmm/ada-language-server/win32-latest.zip)
56-
* Mac OS X - take
57-
[darwin.tar.gz](https://dl.bintray.com/reznikmm/ada-language-server/darwin-latest.tar.gz)
58-
59-
To build is from source install dependencies and run
47+
You can build language server from sources.
48+
To build is from sources install dependencies and run
6049
```
6150
make
6251
```
@@ -68,8 +57,9 @@ It will build `.obj/server/ada_language_server` file.
6857
To build the language server you need:
6958

7059
* A GNAT compiler
71-
* [Libadalang](https://github.com/AdaCore/libadalang) library (it should be
60+
* The [Libadalang](https://github.com/AdaCore/libadalang) library (it should be
7261
built)
62+
* The [Libadalang-tools](https://github.com/AdaCore/libadalang-tools) library
7363
* The [VSS](https://github.com/AdaCore/VSS) library
7464
* The a process [spawn](https://github.com/AdaCore/spawn) library
7565

@@ -136,7 +126,7 @@ client provides its-own way to set such settings.
136126
| `textDocument/completion` | :white_check_mark: |
137127
| `completionItem/resolve` | |
138128
| `textDocument/hover` | :white_check_mark: |
139-
| `textDocument/signatureHelp` | |
129+
| `textDocument/signatureHelp` | :white_check_mark: |
140130
| `textDocument/definition` | :white_check_mark: |
141131
| `textDocument/declaration` | :white_check_mark: |
142132
| `textDocument/typeDefinition` | :white_check_mark: |
@@ -186,7 +176,7 @@ You can bind keyboard shortcuts to them by adding to the `keybindings.json` file
186176
}
187177
```
188178

189-
### Launch extension to debug it
179+
### Launch the extension to debug it
190180
For the moment, this repository includes a vscode extension that is used as the
191181
reference extension for this implementation.
192182

integration/vscode/ada/README.md

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
# Ada/SPARK for Visual Studio Code
22

3-
#### [Repository](https://github.com/AdaCore/ada_language_server)  |  [Issues](https://github.com/AdaCore/ada_language_server/issues)  |  [Documentation](https://github.com/AdaCore/ada_language_server/blob/master/integration/vscode/ada/README.md)  |  [Code Samples](https://github.com/AdaCore/ada_language_server/tree/master/integration/vscode/Code%20Samples)  |  [Offline Installers](https://bintray.com/reznikmm/ada-language-server/ada-language-server/_latestVersion)
3+
#### [Repository](https://github.com/AdaCore/ada_language_server)  |  [Issues](https://github.com/AdaCore/ada_language_server/issues)  |  [Documentation](https://github.com/AdaCore/ada_language_server/blob/master/integration/vscode/ada/README.md)  |  [Code Samples](https://github.com/AdaCore/ada_language_server/tree/master/integration/vscode/Code%20Samples)
44

55

6-
[![Build Status](https://travis-ci.org/AdaCore/ada_language_server.svg?branch=master)](https://travis-ci.org/AdaCore/ada_language_server)
6+
[![Build binaries](https://github.com/AdaCore/ada_language_server/workflows/Build%20binaries/badge.svg)](https://github.com/AdaCore/ada_language_server/actions)
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)
8+
[![VS Marketplace](https://img.shields.io/visual-studio-marketplace/v/adacore.ada?label=VS%20Marketplace)](https://marketplace.visualstudio.com/items?itemName=AdaCore.ada)
9+
[![Open VSX Registry](https://img.shields.io/open-vsx/v/AdaCore/ada?label=Open%20VSX)](https://open-vsx.org/extension/AdaCore/ada)
10+
[![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)
711

812
This extension provides support for Ada/SPARK programing language via
913
[Ada language server](https://github.com/AdaCore/ada_language_server)

0 commit comments

Comments
 (0)