From da815f40d311f0342025da5b8a250fecb47f0888 Mon Sep 17 00:00:00 2001 From: gjsjohnmurray Date: Fri, 20 Sep 2024 16:17:21 +0100 Subject: [PATCH 1/2] Another attempt to fix broken beta build CI --- .github/workflows/main.yml | 24 ++++++++++++------------ .github/workflows/prerelease.yml | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 49383fc9..1d229d45 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -55,8 +55,8 @@ jobs: tmp=$(mktemp) jq --arg version "$VERSION" '.version = $version' package.json > "$tmp" && mv "$tmp" package.json mkdir dist - echo $VERSION > .version - echo $NAME > .name + echo $VERSION > meta.version + echo $NAME > meta.name - name: Use Node.js uses: actions/setup-node@v4 with: @@ -77,10 +77,10 @@ jobs: path: ${{ steps.set-version.outputs.name }}.vsix - uses: actions/upload-artifact@v4 with: - name: meta-build + name: meta path: | - .name - .version + meta.name + meta.version beta: if: (github.event_name == 'push') runs-on: ubuntu-latest @@ -88,14 +88,14 @@ jobs: steps: - uses: actions/download-artifact@v4 with: - name: meta-beta + name: meta path: . - name: Set an output id: set-version run: | set -x - echo "version=`cat .version`" >> $GITHUB_OUTPUT - echo "name=`cat .name`" >> $GITHUB_OUTPUT + echo "version=`cat meta.version`" >> $GITHUB_OUTPUT + echo "name=`cat meta.name`" >> $GITHUB_OUTPUT - uses: actions/download-artifact@v4 with: name: ${{ steps.set-version.outputs.name }}.vsix @@ -118,7 +118,7 @@ jobs: token: ${{ secrets.TOKEN }} - uses: actions/download-artifact@v4 with: - name: meta-publish + name: meta path: . - name: Use Node.js uses: actions/setup-node@v4 @@ -127,9 +127,9 @@ jobs: - name: Prepare build id: set-version run: | - VERSION=`cat .version` - NEXT_VERSION=`cat .version | awk -F. '/[0-9]+\./{$NF++;print}' OFS=.` - echo "name=`cat .name`" >> $GITHUB_OUTPUT + VERSION=`cat meta.version` + NEXT_VERSION=`cat meta.version | awk -F. '/[0-9]+\./{$NF++;print}' OFS=.` + echo "name=`cat meta.name`" >> $GITHUB_OUTPUT tmp=$(mktemp) git config --global user.name 'ProjectBot' git config --global user.email 'bot@users.noreply.github.com' diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index fea2ff03..cc87a216 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -50,8 +50,8 @@ jobs: tmp=$(mktemp) jq --arg version "$VERSION" '.version = $version' package.json > "$tmp" && mv "$tmp" package.json mkdir dist - echo $VERSION > .version - echo $NAME > .name + echo $VERSION > meta.version + echo $NAME > meta.name - name: Use Node.js uses: actions/setup-node@v4 with: @@ -72,10 +72,10 @@ jobs: path: ${{ steps.set-version.outputs.name }}.vsix - uses: actions/upload-artifact@v4 with: - name: meta-build + name: meta path: | - .name - .version + meta.name + meta.version beta: if: (github.event_name == 'push') runs-on: ubuntu-latest @@ -83,14 +83,14 @@ jobs: steps: - uses: actions/download-artifact@v4 with: - name: meta-beta + name: meta path: . - name: Set an output id: set-version run: | set -x - echo "version=`cat .version`" >> $GITHUB_OUTPUT - echo "name=`cat .name`" >> $GITHUB_OUTPUT + echo "version=`cat meta.version`" >> $GITHUB_OUTPUT + echo "name=`cat meta.name`" >> $GITHUB_OUTPUT - uses: actions/download-artifact@v4 with: name: ${{ steps.set-version.outputs.name }}.vsix @@ -113,7 +113,7 @@ jobs: token: ${{ secrets.TOKEN }} - uses: actions/download-artifact@v4 with: - name: meta-publish + name: meta path: . - name: Use Node.js uses: actions/setup-node@v4 @@ -122,9 +122,9 @@ jobs: - name: Prepare pre-release build id: set-version run: | - VERSION=`cat .version` - NEXT_VERSION=`cat .version | awk -F. '/[0-9]+\./{$NF++;print}' OFS=.` - echo "name=`cat .name`" >> $GITHUB_OUTPUT + VERSION=`cat meta.version` + NEXT_VERSION=`cat meta.version | awk -F. '/[0-9]+\./{$NF++;print}' OFS=.` + echo "name=`cat meta.name`" >> $GITHUB_OUTPUT tmp=$(mktemp) git config --global user.name 'ProjectBot' git config --global user.email 'bot@users.noreply.github.com' From 715889277c9e3eb5ec5ac632f2ca3b919c7260a7 Mon Sep 17 00:00:00 2001 From: gjsjohnmurray Date: Fri, 20 Sep 2024 16:18:06 +0100 Subject: [PATCH 2/2] Trivial comment change to trigger CI beta phase --- src/api/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/index.ts b/src/api/index.ts index cffdcc79..7dc56b17 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -418,7 +418,7 @@ export class AtelierAPI { // Handle console output if (data.console) { - // Let studio actions handle their console output + // Let Studio actions handle their console output const isStudioAction = data.result.content != undefined && data.result.content.length !== 0 &&