Skip to content

Commit

Permalink
Merge branch 'main' into chore/refactor-utils
Browse files Browse the repository at this point in the history
  • Loading branch information
Nick Ardecky committed Apr 8, 2024
2 parents 77d65d1 + 0f92e31 commit 4144179
Show file tree
Hide file tree
Showing 131 changed files with 802 additions and 977 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "feature",
"description" : "Add support for Lambda runtime Java 21"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "feature",
"description" : "Add support for Lambda runtime Node.js 20"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "feature",
"description" : "Add support for Lambda runtime Python 3.12"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "removal",
"description" : "Drop support for the Python 3.7 Lambda runtime"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "removal",
"description" : "Drop support for the Node.js14 Lambda runtime"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "removal",
"description" : "Drop support for the .NET 5.0 Lambda runtime"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "removal",
"description" : "Removed support for Gateway 2023.3"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "removal",
"description" : "Removed support for 2023.1.x IDEs"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "removal",
"description" : "Drop support for the Java 8 (AL2012) Lambda runtime"
}
213 changes: 213 additions & 0 deletions .github/workflows/prerelease.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,213 @@
name: Prerelease
on:
workflow_dispatch:
inputs:
tag_name:
description: 'Tag name for release'
required: false
default: prerelease
push:
branches: [ main, feature/* ]


jobs:
generate_artifact_toolkit:
strategy:
matrix:
supported_versions: [ '2023.3', '2023.2', '2024.1' ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: remove unwanted dependencies
run: |
sudo rm -rf /usr/share/dotnet
sudo rm -rf /opt/ghc
sudo rm -rf "/usr/local/share/boost"
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
- uses: actions/setup-java@v4
with:
distribution: 'corretto'
java-version: '17'
- uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.x'
- name: Generate artifact
run: |
./gradlew -PideProfileName=${{ matrix.supported_versions }} :plugin-toolkit:intellij:buildPlugin
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: plugin-toolkit-${{ matrix.supported_versions }}
path: ./plugins/toolkit/intellij/build/distributions/*.zip
retention-days: 1
generate_artifact_toolkit_standalone:
strategy:
matrix:
supported_versions: [ '2023.3', '2023.2', '2024.1' ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: remove unwanted dependencies
run: |
sudo rm -rf /usr/share/dotnet
sudo rm -rf /opt/ghc
sudo rm -rf "/usr/local/share/boost"
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
- uses: actions/setup-java@v4
with:
distribution: 'corretto'
java-version: '17'
- uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.x'
- name: Generate artifact
run: |
./gradlew -PideProfileName=${{ matrix.supported_versions }} :plugin-toolkit:intellij-standalone:buildPlugin
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: plugin-standalone-${{ matrix.supported_versions }}
path: ./plugins/toolkit/intellij-standalone/build/distributions/*.zip
retention-days: 1

generate_artifact_q:
strategy:
matrix:
supported_versions: [ '2023.3', '2023.2', '2024.1' ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: remove unwanted dependencies
run: |
sudo rm -rf /usr/share/dotnet
sudo rm -rf /opt/ghc
sudo rm -rf "/usr/local/share/boost"
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
- uses: actions/setup-java@v4
with:
distribution: 'corretto'
java-version: '17'
- name: Generate artifact
run: |
./gradlew -PideProfileName=${{ matrix.supported_versions }} :plugin-amazonq:buildPlugin --exclude-task buildResharperPlugin
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: plugin-amazonq-${{ matrix.supported_versions }}
path: ./plugins/amazonq/build/distributions/*.zip
retention-days: 1

generate_artifact_core:
strategy:
matrix:
supported_versions: [ '2023.3', '2023.2', '2024.1' ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: remove unwanted dependencies
run: |
sudo rm -rf /usr/share/dotnet
sudo rm -rf /opt/ghc
sudo rm -rf "/usr/local/share/boost"
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
- uses: actions/setup-java@v4
with:
distribution: 'corretto'
java-version: '17'

- name: Generate artifact
run: |
./gradlew -PideProfileName=${{ matrix.supported_versions }} :plugin-core:buildPlugin
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: plugin-core-${{ matrix.supported_versions }}
path: ./plugins/core/build/distributions/*.zip
retention-days: 1

generate_changelog:
runs-on: ubuntu-latest
outputs:
feature: ${{ steps.assign_output.outputs.feature }}
tagname: ${{ steps.assign_output.outputs.tagname }}
version: ${{ steps.assign_output.outputs.version }}
changes: ${{ steps.assign_output.outputs.changes }}
steps:
- uses: actions/checkout@v4

- uses: actions/setup-java@v4
with:
distribution: 'corretto'
java-version: '17'

- if: github.event_name == 'workflow_dispatch'
run: |
echo "TAG_NAME=${{ github.event.inputs.tag_name }}" >> $GITHUB_ENV
- if: github.ref_name != 'main'
run: |
TAG_NAME=${{ github.ref_name }}
FEAT_NAME=$(echo $TAG_NAME | sed 's/feature\///')
echo "FEAT_NAME=$FEAT_NAME" >> $GITHUB_ENV
echo "TAG_NAME=pre-$FEAT_NAME" >> $GITHUB_ENV
- if: github.ref_name == 'main'
run: |
echo "FEAT_NAME=" >> $GITHUB_ENV
echo "TAG_NAME=prerelease" >> $GITHUB_ENV
- name: Generate changelog
id: changelog
run: |
./gradlew :createRelease :generateChangelog
- name: Provide the metadata to output
id: assign_output
run: |
echo "feature=$FEAT_NAME" >> $GITHUB_OUTPUT
echo "tagname=$TAG_NAME" >> $GITHUB_OUTPUT
echo "version=$(cat gradle.properties | grep toolkitVersion | cut -d'=' -f2)" >> $GITHUB_OUTPUT
echo 'changes<<EOF' >> $GITHUB_OUTPUT
cat CHANGELOG.md | perl -ne 'BEGIN{$/="\n\n"} print; exit if $. == 1' >> $GITHUB_OUTPUT
echo 'EOF' >> $GITHUB_OUTPUT
publish:
needs: [ generate_artifact_toolkit, generate_artifact_toolkit_standalone, generate_artifact_core, generate_artifact_q, generate_changelog ]
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_REPO: ${{ github.repository }}
FEAT_NAME: ${{ needs.generate_changelog.outputs.feature }}
TAG_NAME: ${{ needs.generate_changelog.outputs.tagname }}
AWS_TOOLKIT_VERSION: ${{ needs.generate_changelog.outputs.version }}
BRANCH: ${{ github.ref_name }}
AWS_TOOLKIT_CHANGES: ${{ needs.generate_changelog.outputs.changes }}
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
- name: Delete existing prerelease
# "prerelease" (main branch) or "pre-<feature>"
if: "env.TAG_NAME == 'prerelease' || startsWith(env.TAG_NAME, 'pre-')"
run: |
echo "SUBJECT=AWS Toolkit ${AWS_TOOLKIT_VERSION}: ${FEAT_NAME:-${TAG_NAME}}" >> $GITHUB_ENV
gh release delete "$TAG_NAME" --cleanup-tag --yes || true
- name: Publish to GitHub Releases
run: |
envsubst < "$GITHUB_WORKSPACE/.github/workflows/prerelease_notes.md" > "$RUNNER_TEMP/prerelease_notes.md"
gh release create $TAG_NAME --prerelease --notes-file "$RUNNER_TEMP/prerelease_notes.md" --title "$SUBJECT" --target $GITHUB_SHA plugin-toolkit-*/*.zip
- name: Publish core
run: |
gh release upload $TAG_NAME plugin-core-*/*.zip
- name: Publish Q
run: |
gh release upload $TAG_NAME plugin-amazonq-*/*.zip
- name: Publish Toolkit Standalone
run: |
gh release upload $TAG_NAME plugin-standalone-*/*.zip
11 changes: 11 additions & 0 deletions .github/workflows/prerelease_notes.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
_This is an **unsupported preview build** of the `${BRANCH}` branch of AWS Toolkit._

# Install

1. Download the respective plugin zip from the assets below
2. In the IDE, go to Settings -> Plugins
3. Click on Install plugin from disk and select the downloaded zip

# Changes

${AWS_TOOLKIT_CHANGES}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ unload-*
jetbrains-core/bin/
jetbrains-ultimate/bin/
resources/bin/
jetbrains-rider/**/NuGet.config
**/jetbrains-rider/**/NuGet.config
RiderSdkPackageVersion.props
*.Generated.cs
core/bin
Expand Down
25 changes: 0 additions & 25 deletions .run/Run AWS Toolkit - Core [2023.1].run.xml

This file was deleted.

25 changes: 0 additions & 25 deletions .run/Run AWS Toolkit - Gateway [2023.3].run.xml

This file was deleted.

25 changes: 0 additions & 25 deletions .run/Run AWS Toolkit - Rider [2023.1].run.xml

This file was deleted.

25 changes: 0 additions & 25 deletions .run/Run AWS Toolkit - Ultimate [2023.1].run.xml

This file was deleted.

Loading

0 comments on commit 4144179

Please sign in to comment.