Skip to content

Commit

Permalink
Merge pull request #2586 from ever-co/develop
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
evereq authored Jun 8, 2024
2 parents 32942d7 + 425fb65 commit 23e5ff7
Show file tree
Hide file tree
Showing 364 changed files with 14,726 additions and 9,841 deletions.
15 changes: 13 additions & 2 deletions .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
"Accordian",
"adipiscing",
"aliqua",
"tblr",
"conver",
"amet",
"Andross",
"animatable",
Expand Down Expand Up @@ -333,7 +335,17 @@
"Northflank",
"prebuild",
"dataToDisplay",
"GlobalSkeleton"
"GlobalSkeleton",
"dailyplan",
"tomorow",
"comparization",
"plan",
"setwork",
"Clik",
"Relationnal",
"authjs",
"MICROSOFTENTRAID",
"Entra"
],
"useGitignore": true,
"ignorePaths": [
Expand Down Expand Up @@ -372,7 +384,6 @@
"Chatwoot",
"CHATWOOT",
"apps/web/messages/*.json",
"apps/web/public/locales/**",
"apps/web/lib/i18n/*.ts",
"apps/web/lib/settings/timezones.js",
"apps/mobile/app/screens/DemoShowroomScreen/demos/**",
Expand Down
2 changes: 1 addition & 1 deletion .deploy/k8s/k8s-manifest-api.prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ apiVersion: apps/v1
metadata:
name: ever-teams-prod-api
spec:
replicas: 6
replicas: 3
selector:
matchLabels:
app: ever-teams-prod-api
Expand Down
2 changes: 1 addition & 1 deletion .deploy/k8s/k8s-manifest-api.stage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ apiVersion: apps/v1
metadata:
name: ever-teams-stage-api
spec:
replicas: 3
replicas: 2
selector:
matchLabels:
app: ever-teams-stage-api
Expand Down
2 changes: 1 addition & 1 deletion .deploy/k8s/k8s-manifest.prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ apiVersion: apps/v1
metadata:
name: ever-teams-prod-webapp
spec:
replicas: 8
replicas: 4
selector:
matchLabels:
app: ever-teams-prod-webapp
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-api-do-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
deploy-api-stage:
runs-on: buildjet-4vcpu-ubuntu-2204

environment: prod
environment: stage

steps:
- name: Checkout
Expand Down
253 changes: 253 additions & 0 deletions .github/workflows/server-api.apps.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,253 @@
name: Server API Build Apps

on:
workflow_run:
workflows: ['Release Apps']
branches: [apps]
types:
- completed

concurrency:
group: ${{ github.ref }}-${{ github.workflow }}
cancel-in-progress: true

jobs:
release-linux:
runs-on: ${{ matrix.os }}

strategy:
matrix:
os: [buildjet-8vcpu-ubuntu-2204]

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

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

- name: Change permissions
run: 'sudo chown -R $(whoami) ./*'

- name: Install system dependencies
run: 'sudo apt-get update && sudo apt install -y curl gnupg git libappindicator3-1 ca-certificates binutils icnsutils graphicsmagick'

- name: Fix node-gyp and Python
run: python3 -m pip install packaging setuptools

- name: Install latest version of NPM
run: 'sudo npm install -g npm@9'

- name: Install latest node-gyp package
run: 'sudo npm install --quiet -g [email protected]'

- name: Install Yarn dependencies
run: 'yarn install --network-timeout 1000000 --frozen-lockfile'

- name: Bootstrap Yarn
run: 'yarn bootstrap'

- name: Bump version
uses: actions/github-script@v6
with:
script: |
const script = require('./.scripts/bump-version-electron.js')
script.serverapi(true).then(console.log)
env:
PROJECT_REPO: 'https://github.com/ever-co/ever-teams.git'
DESKTOP_API_SERVER_APP_NAME: 'ever-teams-api-server'
COMPANY_SITE_LINK: 'https://ever.team'
DESKTOP_API_SERVER_APP_DESCRIPTION: 'Ever Teams API Server'
DESKTOP_API_SERVER_APP_ID: 'com.ever.everteamsapiserver'

- name: Build API Server App
run: 'yarn build:gauzy-api-server:linux:release:gh'
env:
USE_HARD_LINKS: false
GH_TOKEN: ${{ secrets.GH_TOKEN }}
EP_GH_IGNORE_TIME: true
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
SENTRY_TRACES_SAMPLE_RATE: '${{ secrets.SENTRY_TRACES_SAMPLE_RATE }}'
SENTRY_HTTP_TRACING_ENABLED: '${{ secrets.SENTRY_HTTP_TRACING_ENABLED }}'
SENTRY_POSTGRES_TRACKING_ENABLED: '${{ secrets.SENTRY_POSTGRES_TRACKING_ENABLED }}'
DO_KEY_ID: ${{ secrets.DO_KEY_ID }}
DO_SECRET_KEY: ${{ secrets.DO_SECRET_KEY }}
NX_NO_CLOUD: true
COMPANY_SITE: 'Ever Teams'
COMPANY_SITE_LINK: 'https://ever.team'
COMPANY_FACEBOOK_LINK: 'https://www.facebook.com/everteamshq'
COMPANY_TWITTER_LINK: 'https://twitter.com/ever_teams'
COMPANY_LINKEDIN_LINK: 'https://www.linkedin.com/company/ever-co'
PROJECT_REPO: 'https://github.com/ever-co/ever-teams.git'
DESKTOP_API_SERVER_APP_NAME: 'ever-teams-api-server'
DESKTOP_API_SERVER_APP_DESCRIPTION: 'Ever Teams API Server'
DESKTOP_API_SERVER_APP_ID: 'com.ever.everteamsapiserver'
DESKTOP_API_SERVER_APP_REPO_NAME: 'ever-teams-api-server'
DESKTOP_API_SERVER_APP_REPO_OWNER: 'ever-co'
DESKTOP_API_SERVER_APP_WELCOME_TITLE: 'Welcome to Ever Teams'
DESKTOP_API_SERVER_APP_WELCOME_CONTENT: 'Ever Teams is a productivity tool that helps you to stay focused on your work and manage your team work better.'
I18N_FILES_URL: 'https://raw.githubusercontent.com/ever-co/ever-teams/develop/apps/server-api/i18n'
PLATFORM_LOGO: 'https://app.ever.team/assets/ever-teams.png'
GAUZY_DESKTOP_LOGO_512X512: 'https://raw.githubusercontent.com/ever-co/ever-gauzy/develop/apps/desktop-timer/src/assets/icons/icon_512x512.png'

release-mac:
runs-on: ${{ matrix.os }}

strategy:
matrix:
os: [macos-12]

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

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

- name: Fix node-gyp and Python
run: python3 -m pip install packaging setuptools

- name: Install latest version of NPM
run: 'sudo npm install -g npm@9'

- name: Install latest node-gyp package
run: 'sudo npm install --quiet -g [email protected]'

- name: Install Yarn dependencies
run: 'yarn install --network-timeout 1000000 --frozen-lockfile'

- name: Bootstrap Yarn
run: 'yarn bootstrap'

- name: Bump version
uses: actions/github-script@v6
with:
script: |
const script = require('./.scripts/bump-version-electron.js')
script.serverapi(true).then(console.log)
env:
PROJECT_REPO: 'https://github.com/ever-co/ever-teams.git'
DESKTOP_API_SERVER_APP_NAME: 'ever-teams-api-server'
COMPANY_SITE_LINK: 'https://ever.team'
DESKTOP_API_SERVER_APP_DESCRIPTION: 'Ever Teams API Server'
DESKTOP_API_SERVER_APP_ID: 'com.ever.everteamsapiserver'

- name: Build API Server App
run: 'yarn build:gauzy-api-server:mac:release'
env:
USE_HARD_LINKS: false
GH_TOKEN: ${{ secrets.GH_TOKEN }}
EP_GH_IGNORE_TIME: true
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
SENTRY_TRACES_SAMPLE_RATE: '${{ secrets.SENTRY_TRACES_SAMPLE_RATE }}'
SENTRY_HTTP_TRACING_ENABLED: '${{ secrets.SENTRY_HTTP_TRACING_ENABLED }}'
SENTRY_POSTGRES_TRACKING_ENABLED: '${{ secrets.SENTRY_POSTGRES_TRACKING_ENABLED }}'
DO_KEY_ID: ${{ secrets.DO_KEY_ID }}
DO_SECRET_KEY: ${{ secrets.DO_SECRET_KEY }}
NX_NO_CLOUD: true
COMPANY_SITE: 'Ever Teams'
COMPANY_SITE_LINK: 'https://ever.team'
COMPANY_FACEBOOK_LINK: 'https://www.facebook.com/everteamshq'
COMPANY_TWITTER_LINK: 'https://twitter.com/ever_teams'
COMPANY_LINKEDIN_LINK: 'https://www.linkedin.com/company/ever-co'
PROJECT_REPO: 'https://github.com/ever-co/ever-teams.git'
DESKTOP_API_SERVER_APP_NAME: 'ever-teams-api-server'
DESKTOP_API_SERVER_APP_DESCRIPTION: 'Ever Teams API Server'
DESKTOP_API_SERVER_APP_ID: 'com.ever.everteamsapiserver'
DESKTOP_API_SERVER_APP_REPO_NAME: 'ever-teams-api-server'
DESKTOP_API_SERVER_APP_REPO_OWNER: 'ever-co'
DESKTOP_API_SERVER_APP_WELCOME_TITLE: 'Welcome to Ever Teams'
DESKTOP_API_SERVER_APP_WELCOME_CONTENT: 'Ever Teams is a productivity tool that helps you to stay focused on your work and manage your team work better.'
I18N_FILES_URL: 'https://raw.githubusercontent.com/ever-co/ever-teams/develop/apps/server-api/i18n'
PLATFORM_LOGO: 'https://app.ever.team/assets/ever-teams.png'
GAUZY_DESKTOP_LOGO_512X512: 'https://raw.githubusercontent.com/ever-co/ever-gauzy/develop/apps/desktop-timer/src/assets/icons/icon_512x512.png'

release-windows:
runs-on: ${{ matrix.os }}

strategy:
matrix:
os: [windows-latest]

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

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

- name: Fix node-gyp and Python
run: python3 -m pip install packaging setuptools

- name: Install latest version of NPM
run: 'npm install -g npm@9'

- name: Install latest node-gyp package
run: 'npm install --quiet -g [email protected]'

- name: Install Yarn dependencies
run: 'yarn install --network-timeout 1000000 --frozen-lockfile'

- name: Bootstrap Yarn
run: 'yarn bootstrap'

- name: Bump version
uses: actions/github-script@v6
with:
script: |
const script = require('./.scripts/bump-version-electron.js')
script.serverapi(true).then(console.log)
env:
PROJECT_REPO: 'https://github.com/ever-co/ever-teams.git'
DESKTOP_API_SERVER_APP_NAME: 'ever-teams-api-server'
COMPANY_SITE_LINK: 'https://ever.team'
DESKTOP_API_SERVER_APP_DESCRIPTION: 'Ever Teams API Server'
DESKTOP_API_SERVER_APP_ID: 'com.ever.everteamsapiserver'

- name: Build API Server App
run: 'yarn build:gauzy-api-server:windows:release:gh'
env:
USE_HARD_LINKS: false
GH_TOKEN: ${{ secrets.GH_TOKEN }}
EP_GH_IGNORE_TIME: true
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
SENTRY_TRACES_SAMPLE_RATE: '${{ secrets.SENTRY_TRACES_SAMPLE_RATE }}'
SENTRY_HTTP_TRACING_ENABLED: '${{ secrets.SENTRY_HTTP_TRACING_ENABLED }}'
SENTRY_POSTGRES_TRACKING_ENABLED: '${{ secrets.SENTRY_POSTGRES_TRACKING_ENABLED }}'
DO_KEY_ID: ${{ secrets.DO_KEY_ID }}
DO_SECRET_KEY: ${{ secrets.DO_SECRET_KEY }}
NX_NO_CLOUD: true
COMPANY_SITE: 'Ever Teams'
COMPANY_SITE_LINK: 'https://ever.team'
COMPANY_FACEBOOK_LINK: 'https://www.facebook.com/everteamshq'
COMPANY_TWITTER_LINK: 'https://twitter.com/ever_teams'
COMPANY_LINKEDIN_LINK: 'https://www.linkedin.com/company/ever-co'
PROJECT_REPO: 'https://github.com/ever-co/ever-teams.git'
DESKTOP_API_SERVER_APP_NAME: 'ever-teams-api-server'
DESKTOP_API_SERVER_APP_DESCRIPTION: 'Ever Teams API Server'
DESKTOP_API_SERVER_APP_ID: 'com.ever.everteamsapiserver'
DESKTOP_API_SERVER_APP_REPO_NAME: 'ever-teams-api-server'
DESKTOP_API_SERVER_APP_REPO_OWNER: 'ever-co'
DESKTOP_API_SERVER_APP_WELCOME_TITLE: 'Welcome to Ever Teams'
DESKTOP_API_SERVER_APP_WELCOME_CONTENT: 'Ever Teams is a productivity tool that helps you to stay focused on your work and manage your team work better.'
I18N_FILES_URL: 'https://raw.githubusercontent.com/ever-co/ever-teams/develop/apps/server-api/i18n'
PLATFORM_LOGO: 'https://app.ever.team/assets/ever-teams.png'
GAUZY_DESKTOP_LOGO_512X512: 'https://raw.githubusercontent.com/ever-co/ever-gauzy/develop/apps/desktop-timer/src/assets/icons/icon_512x512.png'
1 change: 0 additions & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@
cd "apps/web"

yarn lint

12 changes: 7 additions & 5 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,17 @@
"**/.git": true,
"**/.DS_Store": true,
"**/node_modules": false,
"**/public/**/*.png": true,
"**/public/**/*.jpg": true,
"**/public/**/*.png": false,
"**/public/**/*.jpg": false,
"**/public/**/*.pdf": true
},
"search.exclude": {
"**/node_modules": true,
"**/bower_components": true,
"**/*.code-search": true,
"**/web/components/**": true
"**/.idea": true,
"**/.idea/**/*.{xml,iml}": true,
"**/.iml": true,
"**/.yarn": true,
"**/yarn.lock": true
},
"docwriter.style": "Auto-detect"
}
Loading

0 comments on commit 23e5ff7

Please sign in to comment.