Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Another attempt at fixing beta phase of CI #1435

Merged
merged 3 commits into from
Sep 20, 2024
Merged

Another attempt at fixing beta phase of CI #1435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da815f4
Another attempt to fix broken beta build CI
gjsjohnmurray Sep 20, 2024
7158892
Trivial comment change to trigger CI beta phase
gjsjohnmurray Sep 20, 2024
9cb4e26
Merge branch 'master' into olive-silverfish
gjsjohnmurray Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -77,25 +77,25 @@ 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
needs: build
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
Expand All @@ -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
Expand All @@ -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'
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/prerelease.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -72,25 +72,25 @@ 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
needs: build
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
Expand All @@ -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
Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion src/api/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,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 &&
Expand Down