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.

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

Refactoring: merge utils into prelude; merge workspaces. #3151

Merged
merged 8 commits into from
Nov 10, 2021
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
29 changes: 15 additions & 14 deletions .github/workflows/gui.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@

# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# DO NOT CHANGE THIS FILE. IT WAS GENERATED FROM 'build/workflow.js'. READ DOCS THERE TO LEARN MORE.
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

name: GUI CI
"on":
'on':
push:
branches:
- develop
Expand Down Expand Up @@ -50,7 +51,7 @@ jobs:
node ./run ci-gen --skip-version-validation
content=`cat CURRENT_RELEASE_CHANGELOG.json`
echo "::set-output name=content::$content"

shell: bash
- name: Assert Version Unstable
run: node ./run assert-version-unstable --skip-version-validation
Expand All @@ -76,7 +77,7 @@ jobs:
list=`git diff --name-only origin/${{github.base_ref}} HEAD | tr '\n' ' '`
echo $list
echo "::set-output name=list::'$list'"

shell: bash
if: >-
github.base_ref == 'develop' || github.base_ref == 'unstable' ||
Expand Down Expand Up @@ -116,7 +117,7 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2021-10-29
toolchain: nightly-2021-11-08
override: true
- name: Install Clippy
run: rustup component add clippy
Expand Down Expand Up @@ -146,7 +147,7 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2021-10-29
toolchain: nightly-2021-11-08
override: true
- name: Run tests (no WASM)
run: node ./run test --no-wasm --skip-version-validation
Expand All @@ -172,7 +173,7 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2021-10-29
toolchain: nightly-2021-11-08
override: true
- name: Install wasm-pack (macOS)
env:
Expand Down Expand Up @@ -231,7 +232,7 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2021-10-29
toolchain: nightly-2021-11-08
override: true
- name: Install wasm-pack (macOS)
env:
Expand Down Expand Up @@ -269,7 +270,7 @@ jobs:
- uses: actions/setup-java@v2
with:
distribution: adopt
java-version: "11"
java-version: '11'
- name: Build WASM
run: node ./run build --no-js --skip-version-validation
- name: Upload IDE WASM artifacts
Expand Down Expand Up @@ -299,7 +300,7 @@ jobs:
node ./run ci-gen --skip-version-validation
content=`cat CURRENT_RELEASE_CHANGELOG.json`
echo "::set-output name=content::$content"

shell: bash
- name: Install Node
uses: actions/setup-node@v1
Expand All @@ -310,7 +311,7 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2021-10-29
toolchain: nightly-2021-11-08
override: true
- name: Install wasm-pack (macOS)
env:
Expand Down Expand Up @@ -348,7 +349,7 @@ jobs:
- uses: actions/setup-java@v2
with:
distribution: adopt
java-version: "11"
java-version: '11'
- name: Download IDE WASM artifacts
uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -443,7 +444,7 @@ jobs:
node ./run ci-gen --skip-version-validation
content=`cat CURRENT_RELEASE_CHANGELOG.json`
echo "::set-output name=content::$content"

shell: bash
- id: checkCurrentReleaseTag
uses: mukunku/[email protected]
Expand Down Expand Up @@ -496,7 +497,7 @@ jobs:
node ./run ci-gen --skip-version-validation
content=`cat CURRENT_RELEASE_CHANGELOG.json`
echo "::set-output name=content::$content"

shell: bash
- shell: bash
run: |2-
Expand All @@ -507,7 +508,7 @@ jobs:
us-west-1
text
EOF

- name: Upload 'index.js.gz' to CDN
shell: bash
run: >-
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ target/
**/*.rs.bk
wasm-pack.log
generated/
/target
/build/rust/target/

#############
## Haskell ##
Expand Down Expand Up @@ -135,4 +137,3 @@ test/Database_Tests/data/redshift_credentials.json

*.ir
*.meta

2 changes: 2 additions & 0 deletions .ignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# This file should be ignored by cargo watch, but not by git
.github
Loading