Skip to content

Commit

Permalink
Refactoring: merge utils into prelude; merge workspaces. (#3151)
Browse files Browse the repository at this point in the history
  • Loading branch information
farmaazon authored Nov 10, 2021
1 parent ea1a411 commit 942464c
Show file tree
Hide file tree
Showing 196 changed files with 11,175 additions and 12,652 deletions.
6 changes: 0 additions & 6 deletions .github/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -214,12 +214,6 @@ branches:
- "Build and Test (ubuntu-18.04)"
- "Build and Test (windows-latest)"
- "Docs Check"
- "Rust Check"
- "Rust Lint"
- "Rust Test Native (macOS-latest)"
- "Rust Test Native (ubuntu-latest)"
- "Rust Test Native (windows-latest)"
- "Rust Test WASM"
- "Verify Notice Package"
- "license/cla"
# GUI jobs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ env:
# Please ensure that this is in sync with project/build.properties
sbtVersion: 1.5.2
# Please ensure that this is in sync with rustVersion in build.sbt
rustToolchain: nightly-2021-05-12
rustToolchain: nightly-2021-11-08

jobs:
vuln-scan:
Expand Down
16 changes: 5 additions & 11 deletions .github/workflows/gui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ 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 +75,6 @@ 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 +114,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 +144,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 +170,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 +229,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 @@ -299,7 +297,6 @@ 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 +307,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 @@ -443,7 +440,6 @@ 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 +492,6 @@ 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 +502,6 @@ jobs:
us-west-1
text
EOF
- name: Upload 'index.js.gz' to CDN
shell: bash
run: >-
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/legal-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:
# Please ensure that this is in sync with project/build.properties
sbtVersion: 1.5.2
# Please ensure that this is in sync with rustVersion in build.sbt
rustToolchain: nightly-2021-05-12
rustToolchain: nightly-2021-11-08
excludedPaths: |
.github/PULL_REQUEST_TEMPLATE.md
.github/CODEOWNERS
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:
# Please ensure that this is in sync with project/build.properties
sbtVersion: 1.5.2
# Please ensure that this is in sync with rustVersion in build.sbt
rustToolchain: nightly-2021-05-12
rustToolchain: nightly-2021-11-08
# Please ensure that this is in sync with nodeVersion in scala.yml
nodeVersion: 14.17.2
# Specifies how many nightly releases should be kept. Any older releases are removed.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:
# Please ensure that this is in sync with project/build.properties
sbtVersion: 1.5.2
# Please ensure that this is in sync with rustVersion in build.sbt
rustToolchain: nightly-2021-05-12
rustToolchain: nightly-2021-11-08
# Please ensure that this is in sync with nodeVersion in scala.yml
nodeVersion: 14.17.2

Expand Down
186 changes: 0 additions & 186 deletions .github/workflows/rust.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/scala.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:
# Please ensure that this is in sync with project/build.properties
sbtVersion: 1.5.2
# Please ensure that this is in sync with rustVersion in build.sbt
rustToolchain: nightly-2021-05-12
rustToolchain: nightly-2021-11-08
# Some moderately recent version of Node.JS is needed to run the library download tests.
nodeVersion: 14.17.2

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

0 comments on commit 942464c

Please sign in to comment.