Skip to content

Commit a186dd7

Browse files
committed
Resolve merge conflict with master and remove demo entries from top-level README
1 parent 006f7df commit a186dd7

File tree

3 files changed

+8
-32
lines changed

3 files changed

+8
-32
lines changed

.github/workflows/polyglot-chat-app.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,11 @@ jobs:
1818
name: Run 'polyglot-chat-app'
1919
runs-on: ubuntu-latest
2020
timeout-minutes: 15
21-
strategy:
22-
matrix:
23-
java-version: ['21']
2421
steps:
2522
- uses: actions/checkout@v3
2623
- uses: graalvm/setup-graalvm@v1
2724
with:
28-
java-version: ${{ matrix.java-version }}
25+
java-version: '21'
2926
distribution: 'graalvm'
3027
github-token: ${{ secrets.GITHUB_TOKEN }}
3128
cache: 'gradle'

README.md

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -238,27 +238,6 @@ cd graalvm-demos
238238
</tbody>
239239
</table>
240240

241-
### Python
242-
243-
<table>
244-
<thead>
245-
<tr>
246-
<th align="left">Name</th>
247-
<th align="left">Description</th>
248-
</tr>
249-
</thead>
250-
<tbody>
251-
<tr>
252-
<td align="left" width="30%"><a href="/graalpy-notebook-example/">graalpy-notebook-example</a><br><a href="https://github.com/graalvm/graalvm-demos/actions/workflows/graalpy-notebook-example.yml"><img alt="graalpy-notebook-example" src="https://github.com/graalvm/graalvm-demos/actions/workflows/graalpy-notebook-example.yml/badge.svg" /></a></td>
253-
<td align="left" width="70%">Demonstrates how to embed Python in a Java application running on GraalVM <br><strong>Technologies: </strong>GraalPy</td>
254-
</tr>
255-
<tr>
256-
<td align="left" width="30%"><a href="/polyglot-chat-app/">polyglot-chat-app</a><br><a href="https://github.com/graalvm/graalvm-demos/actions/workflows/polyglot-chat-app.yml"><img alt="polyglot-chat-app" src="https://github.com/graalvm/graalvm-demos/actions/workflows/polyglot-chat-app.yml/badge.svg" /></a></td>
257-
<td align="left" width="70%">Demonstrates how to integrate Python in a Micronaut Java application and build using Gradle <br><strong>Technologies: </strong>Java, GraalPy, Micronaut</td>
258-
</tr>
259-
</tbody>
260-
</table>
261-
262241
### Polyglot
263242

264243
<table>

polyglot-chat-app/README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ The example also shows how to create a native executable from the application us
77
## Preparation
88

99
1. Download or clone the GraalVM demos repository and navigate into the _polyglot-chat-app_ directory:
10-
```bash
11-
git clone https://github.com/graalvm/graalvm-demos
12-
```
13-
```bash
14-
cd graalvm-demos/polyglot-chat-app
15-
```
10+
```bash
11+
git clone https://github.com/graalvm/graalvm-demos
12+
```
13+
```bash
14+
cd graalvm-demos/polyglot-chat-app
15+
```
1616

1717
2. Download and install the latest GraalPy as described in the [Getting Started guide](https://www.graalvm.org/latest/reference-manual/python/#installing-graalpy). For example:
1818
```bash
@@ -81,4 +81,4 @@ The Python code must be copied to the _build/_ directory that is kept next to th
8181

8282
### Learn More
8383

84-
Learn more about GraalVM polyglot capabilities [here](https://www.graalvm.org/latest/reference-manual/polyglot-programming/).
84+
Learn more about GraalVM polyglot capabilities [here](https://www.graalvm.org/latest/reference-manual/polyglot-programming/).

0 commit comments

Comments
 (0)