Skip to content

Update dependencies #303

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

Open
wants to merge 51 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
33324c2
Update Go dependencies
eatonphil Apr 2, 2023
cd6e888
Fix Julia install
eatonphil Apr 2, 2023
aa8d22f
Update openid-client
eatonphil Apr 2, 2023
1e7705a
Closer to tests passing
eatonphil Apr 3, 2023
266f781
Switch off node-sass
eatonphil Apr 3, 2023
c63166e
Fix http tests
eatonphil Apr 3, 2023
f4b8905
Drop ee
eatonphil Jun 27, 2023
f12da9e
Remove oracle, mongo, and sqlserver tests and options for now
eatonphil Jun 27, 2023
8c0c08f
Update go deps
eatonphil Jun 27, 2023
4355f53
Fix for @tabler/react-icons
eatonphil Jun 27, 2023
f859907
Fixes for tsc
eatonphil Jun 27, 2023
037c2ae
Fix all tsc
eatonphil Jun 27, 2023
daaa838
Update all deps
eatonphil Jun 28, 2023
0d95f80
Format and add fake tests
eatonphil Jun 28, 2023
313e28a
Update electron-chromedriver
eatonphil Jun 28, 2023
6d0cf41
Drop survey
eatonphil Jun 28, 2023
b857c98
Fixes for format
eatonphil Jul 9, 2023
73f6244
Format again
eatonphil Jul 9, 2023
bfe69d2
Fix license
eatonphil Jul 9, 2023
3ea3890
Up the timeout for http.test.js
eatonphil Jul 9, 2023
167b6b5
Fix formatting
eatonphil Jul 9, 2023
63c8156
Make sure httpmirror is around
eatonphil Jul 9, 2023
adbe167
Drop mongo install
eatonphil Jul 9, 2023
52f8e97
Debug path
eatonphil Jul 9, 2023
a04cec3
Upgrade nodejs
eatonphil Jul 9, 2023
315a1c7
Change Windows pin
eatonphil Jul 9, 2023
27de192
Which not where
eatonphil Jul 9, 2023
43c1dd2
Debug inPath
eatonphil Jul 9, 2023
5584907
Nodejs to 18
eatonphil Jul 9, 2023
432b9da
Just test http.test.js for now
eatonphil Jul 9, 2023
c24df48
Add exit debug
eatonphil Jul 9, 2023
f6eb662
Filter even more
eatonphil Jul 9, 2023
eb2b832
Strip down pull requests
eatonphil Jul 9, 2023
f42ffe2
Try new port
eatonphil Jul 10, 2023
9808cb6
No console.log
eatonphil Jul 10, 2023
55d0d92
inherit stdio
eatonphil Jul 10, 2023
aaac85b
Switch off of python3 -m http.server
eatonphil Jul 11, 2023
23f4c34
Add fileserver script
eatonphil Jul 11, 2023
893ca5b
Drop -t
eatonphil Jul 11, 2023
38997eb
Drop file filter
eatonphil Jul 11, 2023
e78ccdc
All tests
eatonphil Jul 11, 2023
d0b191c
Format
eatonphil Jul 11, 2023
b3f0391
Fixes for lint
eatonphil Jul 11, 2023
80d0bb9
Add fileserver to gitignore
eatonphil Jul 18, 2023
febf7fa
Run yarn on windows first
eatonphil Jul 18, 2023
7e9e1b0
Drop extra yarn
eatonphil Jul 18, 2023
3035f35
Hardcode yarn
eatonphil Jul 19, 2023
3c43b7b
Drop server
eatonphil Nov 10, 2023
520407a
Drop server tests
eatonphil Nov 10, 2023
126b910
Drop filagg
eatonphil Nov 10, 2023
defb39c
Fix date-fns
eatonphil Nov 10, 2023
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
88 changes: 0 additions & 88 deletions .github/workflows/ee_pull_requests.yml

This file was deleted.

84 changes: 30 additions & 54 deletions .github/workflows/pull_requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -314,57 +314,33 @@ jobs:
- run: git reset --hard # release blows everything up
- run: yarn e2e-test

e2e_windows_tests:
name: End-to-end Windows Tests
runs-on: windows-latest

steps:
- uses: actions/checkout@master
with:
ref: ${{ github.ref }}

- uses: c-hive/gha-yarn-cache@v2
- name: Setup Golang caches
uses: actions/cache@v3
with:
path: |
~/.cache/go-build
~/go/pkg/mod
key: ${{ runner.os }}-golang-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-golang-

- run: ./scripts/ci/prepare_windows.ps1
shell: pwsh
# Needed so we can have ./build/desktop_runner.js ready for tests
- run: yarn build-test-runner
- run: yarn test --detectOpenHandles --forceExit --verbose shared ui desktop
- run: cd runner && go test -race -cover
- run: yarn release-desktop 0.0.0-e2etest
- run: git reset --hard # release blows everything up
- run: yarn e2e-test

server_tests:
name: Server Tests
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@master
with:
ref: ${{ github.ref }}

- uses: c-hive/gha-yarn-cache@v2
- name: Setup Golang caches
uses: actions/cache@v3
with:
path: |
~/.cache/go-build
~/go/pkg/mod
key: ${{ runner.os }}-golang-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-golang-

- run: ./scripts/ci/prepare_linux.sh
- run: yarn release-server 0.0.0-test
- run: sudo apt-get install -y podman
- run: ./server/scripts/test_release.sh datastation-server-x64-0.0.0-test.tar.gz
# TODO: Get Windows tests working again.
# e2e_windows_tests:
# name: End-to-end Windows Tests
# runs-on: windows-latest

# steps:
# - uses: actions/checkout@master
# with:
# ref: ${{ github.ref }}

# - uses: c-hive/gha-yarn-cache@v2
# - name: Setup Golang caches
# uses: actions/cache@v3
# with:
# path: |
# ~/.cache/go-build
# ~/go/pkg/mod
# key: ${{ runner.os }}-golang-${{ hashFiles('**/go.sum') }}
# restore-keys: |
# ${{ runner.os }}-golang-

# - run: ./scripts/ci/prepare_windows.ps1
# shell: pwsh
# # Needed so we can have ./build/desktop_runner.js ready for tests
# - run: yarn build-test-runner
# - run: yarn test --detectOpenHandles --forceExit --verbose shared ui desktop
# - run: cd runner && go test -race -cover
# - run: yarn release-desktop 0.0.0-e2etest
# - run: git reset --hard # release blows everything up
# - run: yarn e2e-test
21 changes: 0 additions & 21 deletions .github/workflows/releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,6 @@ on:
types: [published]

jobs:
build-server:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@master
with:
ref: ${{ github.ref }}

- run: ./scripts/ci/prepare_linux.sh
- run: echo "GIT_TAG=`git tag --points-at HEAD`" >> $GITHUB_ENV
- run: |
echo "RELEASE_ID=`curl -H 'Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' https://api.github.com/repos/multiprocessio/datastation/releases/tags/$GIT_TAG | jq '.id'`" >> $GITHUB_ENV
- run: yarn release-server $GIT_TAG
- name: Upload on release
run: |
curl --fail \
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
-H "Content-Type: application/tar+gzip" \
--data-binary @./releases/datastation-server-x64-$GIT_TAG.tar.gz \
"https://uploads.github.com/repos/multiprocessio/datastation/releases/$RELEASE_ID/assets?name=datastation-server-x64-$GIT_TAG.tar.gz"

build-linux-desktop:
runs-on: ubuntu-latest

Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ runner/runner.exe
dsq
data
.idea

fileserver
3 changes: 0 additions & 3 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
Copyright 2021-2022 Multiprocess Labs LLC

* All content that resides under the "ee/" directory of this repository, if that directory exists, is licensed under the license defined in "ee/LICENSE.md".
* Content outside of the above mentioned directories or restrictions above is available under the "Apache 2.0" license as defined below.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
Expand Down
4 changes: 2 additions & 2 deletions desktop/crud.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export class GenericCrud<T extends { id: string }> {
this.entity
}" WHERE id = ${stubMaker()}`
);
const row = stmt.get(id);
const row = stmt.get(id) as { data_json: string; position: number };
if (!row) {
return [null, -1];
}
Expand Down Expand Up @@ -130,7 +130,7 @@ export const exportDestination = {};
export const metadataCrud = {
get(db: sqlite3.Database) {
const stmt = db.prepare('SELECT * FROM ds_metadata');
const rows = stmt.all();
const rows = stmt.all() as Array<{ key: string; value: string }>;
const metadata: Record<string, string> = {};
for (const row of rows) {
metadata[row.key] = row.value;
Expand Down
Loading