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

Release #2059

Merged
merged 4 commits into from
Jan 4, 2024
Merged

Release #2059

Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion .github/workflows/deploy-do-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install doctl
uses: digitalocean/action-doctl@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-do-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install doctl
uses: digitalocean/action-doctl@v2
Expand Down
64 changes: 32 additions & 32 deletions .github/workflows/deploy-render-dev.yml
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
name: Deploy to Render Dev

on:
workflow_run:
workflows: ['Build and Publish Docker Images Dev']
branches: [render]
types:
- completed
workflow_run:
workflows: ['Build and Publish Docker Images Dev']
branches: [render]
types:
- completed

jobs:
deploy-demo:
runs-on: ubuntu-latest
deploy-demo:
runs-on: ubuntu-latest

environment: dev
environment: dev

steps:
- name: Checkout code
uses: actions/checkout@v3
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up Render CLI
run: |
wget -O render https://github.com/render-oss/render-cli/releases/download/v0.1.8/render-linux-x86_64
chmod +x render
sudo mv render /usr/local/bin/render
mkdir ~/.render
cat << EOF > ~/.render/config.yaml
version: 1
sshPreserveHosts: true
profiles:
default:
defaultRegion: oregon
apiKey: ${{ secrets.RENDER_API_KEY }}
demo:
defaultRegion: oregon
apiKey: ${{ secrets.RENDER_API_KEY }}
EOF
- name: Set up Render CLI
run: |
wget -O render https://github.com/render-oss/render-cli/releases/download/v0.1.8/render-linux-x86_64
chmod +x render
sudo mv render /usr/local/bin/render
mkdir ~/.render
cat << EOF > ~/.render/config.yaml
version: 1
sshPreserveHosts: true
profiles:
default:
defaultRegion: oregon
apiKey: ${{ secrets.RENDER_API_KEY }}
demo:
defaultRegion: oregon
apiKey: ${{ secrets.RENDER_API_KEY }}
EOF

- name: Deploy Services
run: |
cp .render/render.dev.yaml ./render.yaml
render blueprint launch --profile dev
- name: Deploy Services
run: |
cp .render/render.dev.yaml ./render.yaml
render blueprint launch --profile dev
2 changes: 1 addition & 1 deletion .github/workflows/deploy-vercel-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Use Node.js 18.x
uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-vercel-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Use Node.js 18.x
uses: actions/setup-node@v3
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/desktop.apps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ jobs:

steps:
- name: Check out Git repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: 'ever-co/ever-gauzy'
ref: develop

- name: Install Node.js, NPM and Yarn
uses: buildjet/setup-node@v3
with:
node-version: 16
node-version: '18'
cache: 'yarn'

- name: Change permissions
Expand Down Expand Up @@ -105,15 +105,15 @@ jobs:

steps:
- name: Check out Git repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: 'ever-co/ever-gauzy'
ref: develop

- name: Install Node.js, NPM and Yarn
uses: actions/setup-node@v3
with:
node-version: 16
node-version: '18'
cache: 'yarn'

- name: Fix node-gyp and Python
Expand Down Expand Up @@ -179,19 +179,19 @@ jobs:

strategy:
matrix:
os: [windows-latest-l]
os: [windows-latest]

steps:
- name: Check out Git repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: 'ever-co/ever-gauzy'
ref: develop

- name: Install Node.js, NPM and Yarn
uses: actions/setup-node@v3
with:
node-version: 16
node-version: '18'
cache: 'yarn'

- name: Fix node-gyp and Python
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-build-publish-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-build-publish-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/extensions.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Use Node.js 18.x
uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/extensions.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Use Node.js 18.x
uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mobile.apps.android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
exit 1
fi

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Use Node.js 18.x
uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mobile.apps.ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
exit 1
fi

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Use Node.js 18.x
uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mobile.before-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
contents: read

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Skip workflow if PR is from develop to main
if: github.event.pull_request.head.ref == 'develop' && github.event.pull_request.base.ref == 'main'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mobile.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
contents: read

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Use Node.js 18.x
uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mobile.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
contents: read

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Use Node.js 18.x
uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.apps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

steps:
- name: Check out Git repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Bump version and push tag
uses: mathieudutour/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

steps:
- name: Check out Git repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Bump version and push tag
uses: mathieudutour/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

steps:
- name: Check out Git repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Bump version and push tag
uses: mathieudutour/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/typos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
name: Cspell
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: streetsidesoftware/cspell-action@v2
with:
# Github token used to fetch the list of changed files in the commit.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/web.before-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Skip workflow if PR is from develop to main
if: github.event.pull_request.head.ref == 'develop' && github.event.pull_request.base.ref == 'main'
Expand Down
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,12 @@ WIP

## 📄 Content

- `/web` - NextJs-based (React) Web App at <https://app.ever.team> (deployed from `main` branch)
- `/mobile` - Expo (ReactNative) powered mobile app
- `/desktop` - Electron based Desktop Application (customized build from [Ever Gauzy Desktop Timer App](https://github.com/ever-co/ever-gauzy/tree/develop/apps/desktop-timer))
- `/extensions` - Browser Extensions (powered by <https://github.com/PlasmoHQ/plasmo>)
- `/apps/web` - NextJs-based (React) Web App at <https://app.ever.team> (deployed from `main` branch)
- `/apps/mobile` - Expo (ReactNative) powered mobile app
- `/apps/desktop` - Electron-based Desktop Application (customized build from [Ever Gauzy Desktop Timer App](https://github.com/ever-co/ever-gauzy/tree/develop/apps/desktop-timer))
- `/apps/extensions` - Browser Extensions (powered by <https://github.com/PlasmoHQ/plasmo>)
- `/apps/server-api` - Ever Teams API Server (customized build from [Ever Gauzy API Server](https://github.com/ever-co/ever-gauzy/tree/develop/apps/server-api))
- `/apps/server-web` - Electron-based Ever Teams Web Server that serve Ever Teams NextJs frontend (wraps `apps/web` folder)

## 💌 Contact Us

Expand Down
3 changes: 3 additions & 0 deletions apps/server-api/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Ever Teams API Server

The Source code for Ever Teams API Server located in <https://github.com/ever-co/ever-gauzy/tree/develop/apps/server-api>
3 changes: 3 additions & 0 deletions apps/server-web/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Ever Teams Web Server

Electron-based Desktop App that serve Ever Teams NextJs frontend.
Loading