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.

Sign up for GitHub

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 #3275

Merged
merged 8 commits into from
Nov 9, 2024
Merged

Release #3275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3740f52
[Feat]:Implement EditTaskModal component with enhanced task editing U…
Innocent-Akim Nov 7, 2024
728f961
we should not plan the same task twice (#3244)
CREDO23 Nov 8, 2024
0b5b01d
[Feat]: Implement Timesheet logs API integration with State managemen…
Innocent-Akim Nov 8, 2024
d5a4eeb
[Feat]: Added Translations For The UI In Multiple Languages (#3265)
Innocent-Akim Nov 8, 2024
7876fcc
feat: add grouped display for timesheet data by date
Innocent-Akim Nov 8, 2024
06d67fd
Merge pull request #3266 from ever-co/feat/grouped-timesheet-display
evereq Nov 9, 2024
85f6527
chore: desktop apps
evereq Nov 9, 2024
bbcd45d
Merge pull request #3274 from ever-co/develop
evereq Nov 9, 2024
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
90 changes: 45 additions & 45 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,53 +1,53 @@
version: 2.1

orbs:
node: circleci/node@4.9.0
pulumi: pulumi/pulumi@2.0.0
node: circleci/node@4.9.0
pulumi: pulumi/pulumi@2.0.0

aliases:
- &install-node
name: Install Node with NPM using NVM
command: |
echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
echo ' [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV
nvm install v16
nvm alias default v16
echo 'export NODE_OPTIONS=--max_old_space_size=7000' >> $BASH_ENV
echo 'export NG_CLI_ANALYTICS=false' >> $BASH_ENV
source $BASH_ENV
node --version
- &install-chrome
name: Install Chrome
command: |
sudo apt install -y libappindicator3-1
curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
sudo dpkg -i google-chrome.deb
sudo sed -i 's|HERE/chrome\"|HERE/chrome\" --disable-setuid-sandbox|g' /opt/google/chrome/google-chrome
rm google-chrome.deb
- &install-deps
name: Install Global Dependencies
command: |
sudo rm -rf /etc/apt/sources.list.d/heroku.list
sudo apt-get update
sudo apt install npm
sudo apt install build-essential
sudo npm install --quiet node-gyp@9.3.1 -g
sudo npm config set python /usr/bin/python
- &install-yarn
name: Install Latest Yarn
command: |
# remove default yarn
sudo rm -rf $(dirname $(which yarn))/yarn*
# download latest
rm -rf ~/.yarn
curl -o- -L https://yarnpkg.com/install.sh | bash
echo 'export PATH="${PATH}:${HOME}/.yarn/bin:${HOME}/.config/yarn/global/node_modules/.bin"' >> $BASH_ENV
source $BASH_ENV
- &install-node
name: Install Node with NPM using NVM
command: |
echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
echo ' [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV
nvm install v16
nvm alias default v16
echo 'export NODE_OPTIONS=--max_old_space_size=7000' >> $BASH_ENV
echo 'export NG_CLI_ANALYTICS=false' >> $BASH_ENV
source $BASH_ENV
node --version
- &install-chrome
name: Install Chrome
command: |
sudo apt install -y libappindicator3-1
curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
sudo dpkg -i google-chrome.deb
sudo sed -i 's|HERE/chrome\"|HERE/chrome\" --disable-setuid-sandbox|g' /opt/google/chrome/google-chrome
rm google-chrome.deb
- &install-deps
name: Install Global Dependencies
command: |
sudo rm -rf /etc/apt/sources.list.d/heroku.list
sudo apt-get update
sudo apt install npm
sudo apt install build-essential
sudo npm install --quiet node-gyp@10.2.0 -g
sudo npm config set python /usr/bin/python
- &install-yarn
name: Install Latest Yarn
command: |
# remove default yarn
sudo rm -rf $(dirname $(which yarn))/yarn*
# download latest
rm -rf ~/.yarn
curl -o- -L https://yarnpkg.com/install.sh | bash
echo 'export PATH="${PATH}:${HOME}/.yarn/bin:${HOME}/.config/yarn/global/node_modules/.bin"' >> $BASH_ENV
source $BASH_ENV

defaults: &defaults
# put here anything which is common between all jobs
# we define default work dir, however almost every job redefine it
working_directory: /tmp/workspace
# put here anything which is common between all jobs
# we define default work dir, however almost every job redefine it
working_directory: /tmp/workspace

jobs:
say-hello:
Expand All @@ -60,8 +60,8 @@ jobs:
steps:
- checkout
- run:
name: "Say hello"
command: "echo Hello, World!"
name: 'Say hello'
command: 'echo Hello, World!'

# Orchestrate jobs using workflows
# See: https://circleci.com/docs/configuration-reference/#workflows
Expand Down
155 changes: 3 additions & 152 deletions .github/workflows/desktop-server-api.apps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
run: 'sudo npm install -g npm@9'

- name: Install latest node-gyp package
run: 'sudo npm install --quiet -g node-gyp@9.3.1'
run: 'sudo npm install --quiet -g node-gyp@10.2.0'

- name: Install Yarn dependencies
run: 'yarn install --network-timeout 1000000 --frozen-lockfile'
Expand Down Expand Up @@ -123,7 +123,7 @@ jobs:
run: 'sudo npm install -g npm@9'

- name: Install latest node-gyp package
run: 'sudo npm install --quiet -g node-gyp@9.3.1'
run: 'sudo npm install --quiet -g node-gyp@10.2.0'

- name: Install Yarn dependencies
run: 'yarn install --network-timeout 1000000 --frozen-lockfile'
Expand Down Expand Up @@ -201,7 +201,7 @@ jobs:
run: 'npm install -g npm@9'

- name: Install latest node-gyp package
run: 'npm install --quiet -g node-gyp@9.3.1'
run: 'npm install --quiet -g node-gyp@10.2.0'

- name: Install Yarn dependencies
run: 'yarn install --network-timeout 1000000 --frozen-lockfile'
Expand Down Expand Up @@ -256,152 +256,3 @@ jobs:
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'
# Override unwanted environment variables
ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE: ''
ANT_HOME: ''
AZURE_CONFIG_DIR: ''
AZURE_DEVOPS_CACHE_DIR: ''
AZURE_EXTENSION_DIR: ''
AZ_DEVOPS_GLOBAL_CONFIG_DIR: ''
CABAL_DIR: ''
ChocolateyInstall: ''
ChromeWebDriver: ''
COBERTURA_HOME: ''
# COMPUTERNAME: ''
# COMSPEC: ''
# CONDA: ''
# DEPLOYMENT_BASEPATH: ''
SBT_HOME: ''
SELENIUM_JAR_PATH: ''
STATS_BLT: ''
STATS_D: ''
STATS_D_D: ''
STATS_EXT: ''
STATS_EXTP: ''
STATS_RDCL: ''
STATS_TIS: ''
STATS_TRP: ''
STATS_UE: ''
STATS_V3PS: ''
STATS_VMD: ''
STATS_VMFE: ''
ANDROID_HOME: ''
ANDROID_NDK: ''
ANDROID_NDK_HOME: ''
ANDROID_NDK_LATEST_HOME: ''
ANDROID_NDK_ROOT: ''
ANDROID_SDK_ROOT: ''
# GITHUB_ACTION: ''
# GITHUB_ACTIONS: ''
# GITHUB_ACTION_REF: ''
# GITHUB_ACTION_REPOSITORY: ''
# GITHUB_ACTOR: ''
# GITHUB_ACTOR_ID: ''
# GITHUB_API_URL: ''
# GITHUB_BASE_REF: ''
# GITHUB_ENV: ''
# GITHUB_EVENT_NAME: ''
# GITHUB_EVENT_PATH: ''
# GITHUB_GRAPHQL_URL: ''
# GITHUB_HEAD_REF: ''
# GITHUB_JOB: ''
# GITHUB_OUTPUT: ''
# GITHUB_PATH: ''
# GITHUB_REF: ''
# GITHUB_REF_NAME: ''
# GITHUB_REF_PROTECTED: ''
# GITHUB_REF_TYPE: ''
# GITHUB_REPOSITORY: ''
# GITHUB_REPOSITORY_ID: ''
# GITHUB_REPOSITORY_OWNER: ''
# GITHUB_REPOSITORY_OWNER_ID: ''
# GITHUB_RETENTION_DAYS: ''
# GITHUB_RUN_ATTEMPT: ''
# GITHUB_RUN_ID: ''
# GITHUB_RUN_NUMBER: ''
# GITHUB_SERVER_URL: ''
# GITHUB_SHA: ''
# GITHUB_STATE: ''
# GITHUB_STEP_SUMMARY: ''
# GITHUB_TRIGGERING_ACTOR: ''
# GITHUB_WORKFLOW: ''
# GITHUB_WORKFLOW_REF: ''
# GITHUB_WORKFLOW_SHA: ''
# GITHUB_WORKSPACE: ''
GOROOT_1_20_X64: ''
GOROOT_1_21_X64: ''
GOROOT_1_22_X64: ''
GRADLE_HOME: ''
# HOMEDRIVE: ''
# HOMEPATH: ''
IEWebDriver: ''
ImageOS: ''
ImageVersion: ''
JAVA_HOME: ''
JAVA_HOME_11_X64: ''
JAVA_HOME_17_X64: ''
JAVA_HOME_21_X64: ''
JAVA_HOME_8_X64: ''
# LOCALAPPDATA: ''
# LOGONSERVER: ''
M2: ''
M2_REPO: ''
MAVEN_OPTS: ''
MonAgentClientLocation: ''
# npm_config_prefix: ''
# NUMBER_OF_PROCESSORS: ''
# OS: ''
# PATHEXT: ''
# PERFLOG_LOCATION_SETTING: ''
PGBIN: ''
PGDATA: ''
PGPASSWORD: ''
PGROOT: ''
PGUSER: ''
PHPROOT: ''
PIPX_BIN_DIR: ''
PIPX_HOME: ''
POWERSHELL_DISTRIBUTION_CHANNEL: ''
POWERSHELL_UPDATECHECK: ''
PROCESSOR_ARCHITECTURE: ''
PROCESSOR_IDENTIFIER: ''
PROCESSOR_LEVEL: ''
PROCESSOR_REVISION: ''
PSModuleAnalysisCachePath: ''
PSModulePath: ''
Path: 'C:\hostedtoolcache\windows\node\20.11.1\x64;C:\Program Files\Git\bin;C:\npm\prefix;C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts;C:\hostedtoolcache\windows\Python\3.9.13\x64;C:\Program Files\OpenSSL\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\OpenSSH\;C:\Program Files\dotnet\;C:\Program Files\PowerShell\7\;C:\Program Files\CMake\bin;C:\Program Files\nodejs\;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\Amazon\AWSCLIV2\'
DOTNET_MULTILEVEL_LOOKUP: ''
DOTNET_NOLOGO: ''
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: ''
DriverData: ''
EdgeWebDriver: ''
GCM_INTERACTIVE: ''
GeckoWebDriver: ''
GHCUP_INSTALL_BASE_PREFIX: ''
GHCUP_MSYS2: ''
# RTOOLS44_HOME: ''
RUNNER_ARCH: ''
RUNNER_ENVIRONMENT: ''
RUNNER_NAME: ''
RUNNER_OS: ''
RUNNER_PERFLOG: ''
RUNNER_TEMP: ''
RUNNER_TOOL_CACHE: ''
RUNNER_TRACKING_ID: ''
RUNNER_WORKSPACE: ''
# USERDOMAIN: ''
# USERDOMAIN_ROAMINGPROFILE: ''
# USERNAME: ''
# USERPROFILE: ''
# VCPKG_INSTALLATION_ROOT: ''
# WIX: ''
# TERM: ''
# HOME: ''
# WINDIR: ''
# ProgramData: ''
# PROGRAMFILES: ''
# ProgramW6432: ''
# ALLUSERSPROFILE: ''
# APPDATA: ''
# COMMONPROGRAMFILES: ''
# CommonProgramFiles(x86)
Loading
Loading