Skip to content

Commit 96fb2ad

Browse files
committed
Merge remote-tracking branch 'origin/main' into lsp-codemirror
2 parents 02d08b0 + a767053 commit 96fb2ad

File tree

10 files changed

+406
-367
lines changed

10 files changed

+406
-367
lines changed

.devcontainer/devcontainer.json

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,43 @@
1+
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
2+
// README at: https://github.com/devcontainers/templates/tree/main/src/java
13
{
2-
"image": "mcr.microsoft.com/devcontainers/universal:2",
4+
"name": "Java",
5+
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6+
"image": "mcr.microsoft.com/devcontainers/java:1-21-bullseye",
7+
38
"features": {
4-
"ghcr.io/nordcominc/devcontainer-features/android-sdk:1": {}
9+
"ghcr.io/devcontainers/features/java:1": {
10+
"installGradle": true,
11+
"installGroovy": false,
12+
"installMaven": false,
13+
"installAnt": false,
14+
"version": "21",
15+
"jdkDistro": "ms",
16+
"gradleVersion": "latest",
17+
"mavenVersion": "none"
18+
},
19+
"ghcr.io/nordcominc/devcontainer-features/android-sdk:1": {
20+
"platform": "35",
21+
"build_tools": "35.0.0"
22+
},
23+
"ghcr.io/devcontainers/features/node:1": {
24+
"nodeGypDependencies": false,
25+
"installYarnUsingApt": false,
26+
"version": "lts",
27+
"pnpmVersion": "latest",
28+
"nvmVersion": "latest"
29+
}
530
}
6-
}
31+
32+
// Use 'forwardPorts' to make a list of ports inside the container available locally.
33+
// "forwardPorts": [],
34+
35+
// Use 'postCreateCommand' to run commands after the container is created.
36+
// "postCreateCommand": "java -version",
37+
38+
// Configure tool-specific properties.
39+
// "customizations": {},
40+
41+
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
42+
// "remoteUser": "root"
43+
}

.github/dependabot.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for more information:
4+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
# https://containers.dev/guide/dependabot
6+
7+
version: 2
8+
updates:
9+
- package-ecosystem: "devcontainers"
10+
directory: "/"
11+
schedule:
12+
interval: weekly

.github/workflows/community-release-notifier.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ on:
1212
required: true
1313
description: "release URL"
1414
type: 'string'
15+
body:
16+
required: true
17+
description: "Release Body"
18+
type: 'string'
19+
default: ''
1520
secrets:
1621
DISCORD_WEBHOOK_RELEASE_NOTES:
1722
description: 'Discord Webhook for Notifying Releases to Discord'
@@ -30,6 +35,7 @@ jobs:
3035
stringToTruncate: |
3136
📢 Acode [${{ github.event.release.tag_name || inputs.tag_name }}](<${{ github.event.release.url || inputs.url }}>) was just Released 🎉!
3237
38+
${{ github.event.release.body || inputs.body }}
3339
3440
- name: Discord Webhook Action (Publishing)
3541
uses: tsickert/discord-webhook@c840d45a03a323fbc3f7507ac7769dbd91bfb164 # v5.3.0

.github/workflows/nightly-build.yml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
outputs:
6666
release_output_url: ${{ steps.release.outputs.url }}
6767
updated_version: ${{ steps.update-version.outputs.UPDATED_VERSION}}
68+
RELEASE_NOTES: ${{ env.RELEASE_NOTES }}
6869
steps:
6970
- name: Fast Fail if secrets are missing
7071
if: ${{ env.KEYSTORE_CONTENT == '' || env.BUILD_JSON_CONTENT == '' }}
@@ -201,6 +202,7 @@
201202
- name: Check Nightly Tag and Force Update
202203
#if: github.event_name == 'push' && contains(github.event.ref, 'tags/nightly') == false
203204
if: ${{ ! inputs.skip_tagging_and_releases }}
205+
id: check-nightly-tag-force-update
204206
run: |
205207
# Check if the nightly tag exists and get the commit it points to
206208
if git show-ref --quiet refs/tags/nightly; then
@@ -223,10 +225,22 @@
223225
echo "Nightly tag already points to this commit. Skipping update."
224226
fi
225227
228+
229+
- name: Generate Release Notes (Experimental)
230+
if: ${{ success() && env.releaseRequired == 'true' }}
231+
id: gen-release-notes
232+
continue-on-error: true
233+
run: |
234+
RELEASE_NOTES=$(node utils/scripts/generate-release-notes.js ${{ github.repository_owner }} Acode ${{ github.sha }} --format md --from-tag ${{ env.TAG_COMMIT }} --important-only --quiet --changelog-only)
235+
{
236+
echo "RELEASE_NOTES<<EOF"
237+
echo "$RELEASE_NOTES"
238+
echo "EOF"
239+
} >> $GITHUB_ENV
226240
- name: Release Nightly Version
227241
# Only run this step, if not called from another workflow. And a previous step is successful with releasedRequired=true
228242
id: release
229-
if: ${{ ! inputs.skip_tagging_and_releases && success() && env.releaseRequired == 'true' && !inputs.is_PR }}
243+
if: ${{ ! inputs.skip_tagging_and_releases && steps.check-nightly-tag-force-update.outcome == 'success' && env.releaseRequired == 'true' && !inputs.is_PR }}
230244
uses: softprops/action-gh-release@v2
231245
with:
232246
prerelease: true
@@ -240,6 +254,8 @@
240254
241255
[Compare Changes](https://github.com/${{ github.repository }}/compare/${{ env.TAG_COMMIT }}...${{ github.sha }})
242256
257+
${{ env.RELEASE_NOTES }}
258+
243259
- name: Update Last Comment by bot (If ran in PR)
244260
if: inputs.is_PR
245261
uses: marocchino/sticky-pull-request-comment@v2
@@ -261,5 +277,6 @@
261277
with:
262278
tag_name: ${{ needs.build.outputs.updated_version }}
263279
url: ${{ needs.build.outputs.release_output_url }}
280+
body: ${{ needs.build.outputs.RELEASE_NOTES }}
264281
secrets:
265282
DISCORD_WEBHOOK_RELEASE_NOTES: ${{ secrets.DISCORD_WEBHOOK_RELEASE_NOTES }}

0 commit comments

Comments
 (0)