Skip to content

Commit

Permalink
merged master
Browse files Browse the repository at this point in the history
Signed-off-by: Kevin Su <[email protected]>
  • Loading branch information
pingsutw committed Oct 18, 2023
2 parents d014d60 + 3edbb2b commit 6de66de
Show file tree
Hide file tree
Showing 240 changed files with 47,192 additions and 5,168 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 18.16.1
- name: Install dependencies
run: yarn install --immutable
- name: Release
Expand All @@ -92,7 +92,8 @@ jobs:
GIT_AUTHOR_EMAIL: "[email protected]"
GIT_COMMITTER_NAME: "flyte bot"
GIT_COMMITTER_EMAIL: "[email protected]"
run: npx semantic-release
CI: "true"
run: npx [email protected]

check_for_tag:
name: Get Release Tag
Expand Down
3 changes: 3 additions & 0 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

# exit if in a CI environment
[ -n "$CI" ] && exit 0

npx --no -- commitlint --edit ${1}
2 changes: 2 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/usr/bin/env sh

. "$(dirname -- "$0")/_/husky.sh"
# exit if in a CI environment
[ -n "$CI" ] && exit 0

echo "Linting staged files..."
Expand Down
3 changes: 3 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# last modified: 27 July 2016
# Set a new registry for a scoped package
# @myscope:registry=https://mycustomregistry.example.org
19 changes: 17 additions & 2 deletions release.config.js → .releaserc.js
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const { execSync } = require('child_process');
const path = require('path');

/**
*
Expand All @@ -16,7 +17,14 @@ function getProdConfiguration() {
'# Changelog\n\nAll notable changes to this project will be documented in this file. See\n[Conventional Commits](https://conventionalcommits.org) for commit guidelines.',
},
],
['@semantic-release/npm', { npmPublish: false }],
// set package.json version
[
'@semantic-release/exec',
{
// eslint-disable-next-line no-template-curly-in-string
prepareCmd: 'make update_npmversion VERSION=${nextRelease.version}',
},
],
'@semantic-release/github',
],
};
Expand Down Expand Up @@ -55,7 +63,14 @@ function getTestConfiguration() {
'# Changelog\n\nAll notable changes to this project will be documented in this file. See\n[Conventional Commits](https://conventionalcommits.org) for commit guidelines.',
},
],
['@semantic-release/npm', { npmPublish: false }],
// set package.json version
[
'@semantic-release/exec',
{
// eslint-disable-next-line no-template-curly-in-string
prepareCmd: 'make update_npmversion VERSION=${nextRelease.version}',
},
],
// ["@semantic-release/github", {
// "verifyConditions": false,
// "publish": false,
Expand Down
376 changes: 124 additions & 252 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -210,4 +210,4 @@ yarn install

Your new localhost is [localhost.different.admin.service.com](http://localhost.different.admin.service.com)

> Ensure you don't have `ADMIN_API_URL` or `DISABLE_AUTH` set (e.g., in your `/.profile`.)
> Ensure you don't have `ADMIN_API_URL` set (e.g., in your `/.profile`.)
4 changes: 1 addition & 3 deletions Makefile
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,4 @@ PLACEHOLDER_NPM := "version": "0.0.0-develop"

.PHONY: update_npmversion
update_npmversion:
echo "Updating client-app version to: $(VERSION)"
grep '$(PLACEHOLDER_NPM)' website/package.json
sed -i 's/$(PLACEHOLDER_NPM)/"version": "$(VERSION)"/g' website/package.json
./script/update_npmversion.sh ${VERSION}
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ For help with installing dependencies look into
```
2. Now, export the following env variables:

`export ADMIN_API_URL=http://localhost:30080 export DISABLE_AUTH=1`
`export ADMIN_API_URL=http://localhost:30080`

> You can persist these environment variables either in the current shell or in a `.env` file at the root
> of the repository. A `.env` file will persist the settings across multiple terminal
Expand Down Expand Up @@ -116,12 +116,10 @@ few environment variables in your run command to setup the appliation.

`CONFIG_DIR="/etc/flyte/config"` (required)

`DISABLE_AUTH="1"` (optional)

This example assumes building from `v1.0.0` on port `8080`

```bash
docker run -p 8080:8080 -e BASE_URL="/console" -e CONFIG_DIR="/etc/flyte/config" -e DISABLE_AUTH="1" ghcr.io/flyteorg/flyteconsole:v1.0.0
docker run -p 8080:8080 -e BASE_URL="/console" -e CONFIG_DIR="/etc/flyte/config" ghcr.io/flyteorg/flyteconsole:v1.0.0
```

### Run the server
Expand Down
5 changes: 4 additions & 1 deletion commitlint.config.js
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
module.exports = { extends: ['@commitlint/config-conventional'] };
module.exports = {
extends: ['@commitlint/config-conventional'],
ignores: [commit => commit.includes('[skip ci]')],
};
Loading

0 comments on commit 6de66de

Please sign in to comment.