Skip to content

Commit

Permalink
..
Browse files Browse the repository at this point in the history
  • Loading branch information
@ggazzo
ggazzo committed Apr 10, 2022
1 parent 1ec1f41 commit 00cc675
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 62 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/build_and_test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: "14.18.3"
cache: "yarn"

- uses: actions/checkout@v3

Expand All @@ -60,6 +59,7 @@ jobs:
with:
path: /home/runner/.cache/Cypress
key: ${{ runner.OS }}-cache-cypress-${{ hashFiles('**/package-lock.json', '.github/workflows/build_and_test.yml') }}
- uses: c-hive/gha-yarn-cache@v2
- name: Cache turbo
id: cache-turbo
uses: actions/cache@v2
Expand Down Expand Up @@ -221,6 +221,7 @@ jobs:
restore-keys: |
${{ runner.os }}-cache-cypress-
${{ runner.os }}-
- uses: c-hive/gha-yarn-cache@v2
- name: Cache turbo
id: cache-turbo
uses: actions/cache@v2
Expand Down Expand Up @@ -327,6 +328,7 @@ jobs:
with:
path: /home/runner/.cache/Cypress
key: ${{ runner.OS }}-cache-cypress-${{ hashFiles('**/package-lock.json', '.github/workflows/build_and_test.yml') }}
- uses: c-hive/gha-yarn-cache@v2
- name: Cache turbo
id: cache-turbo
uses: actions/cache@v2
Expand All @@ -343,7 +345,7 @@ jobs:
run: yarn

- name: Build micro services
run: yarn build --scope=rocketchat-services
run: yarn build:services

- name: E2E Test API
env:
Expand Down Expand Up @@ -432,6 +434,7 @@ jobs:
sudo apt clean
docker rmi $(docker image ls -aq)
df -h
- uses: c-hive/gha-yarn-cache@v2
- name: Cache turbo
id: cache-turbo
uses: actions/cache@v2
Expand Down Expand Up @@ -463,7 +466,6 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: "14.18.3"
cache: "yarn"

- name: Install Meteor
run: |
Expand Down Expand Up @@ -750,7 +752,6 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: "14.18.3"
cache: "yarn"

- name: Login to DockerHub
uses: docker/login-action@v1
Expand All @@ -769,7 +770,7 @@ jobs:
# first install repo dependencies
yarn
yarn build --scope=rocketchat-services
yarn build:services
echo "Building Docker image for service: ${{ matrix.service }}:${IMAGE_TAG}"
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/tests/cypress/pageobjects/main-content.page.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,8 +301,8 @@ class MainContent extends Page {

closeMessageActionMenu() {
cy.get('body').realHover({ position: 'topLeft' });
this.messageOptionsBtns.should('not.exist');
this.messageActionMenuBtns.should('not.exist');
// this.messageOptionsBtns.should('not.exist');
// this.messageActionMenuBtns.should('not.exist');
}

setLanguageToEnglish() {
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@
"scripts": {
"postinstall": "husky install",
"build": "turbo run build",
"build:services": "turbo run build --filter=rocketchat-services...",
"build:ci": "turbo run build:ci",
"testunit": "turbo run testunit",
"dev": "turbo run dev --parallel",
"lint": "turbo run lint"
},
"devDependencies": {
"husky": "^7.0.1",
"turbo": "latest"
"turbo": "1.2.0"
},
"workspaces": [
"apps/*",
Expand Down
108 changes: 54 additions & 54 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23890,7 +23890,7 @@ __metadata:
resolution: "rocket.chat@workspace:."
dependencies:
husky: ^7.0.1
turbo: latest
turbo: 1.2.0
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -26525,106 +26525,106 @@ __metadata:
languageName: node
linkType: hard

"turbo-darwin-64@npm:1.1.10":
version: 1.1.10
resolution: "turbo-darwin-64@npm:1.1.10"
"turbo-darwin-64@npm:1.2.0":
version: 1.2.0
resolution: "turbo-darwin-64@npm:1.2.0"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard

"turbo-darwin-arm64@npm:1.1.10":
version: 1.1.10
resolution: "turbo-darwin-arm64@npm:1.1.10"
"turbo-darwin-arm64@npm:1.2.0":
version: 1.2.0
resolution: "turbo-darwin-arm64@npm:1.2.0"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard

"turbo-freebsd-64@npm:1.1.10":
version: 1.1.10
resolution: "turbo-freebsd-64@npm:1.1.10"
"turbo-freebsd-64@npm:1.2.0":
version: 1.2.0
resolution: "turbo-freebsd-64@npm:1.2.0"
conditions: os=freebsd & cpu=x64
languageName: node
linkType: hard

"turbo-freebsd-arm64@npm:1.1.10":
version: 1.1.10
resolution: "turbo-freebsd-arm64@npm:1.1.10"
"turbo-freebsd-arm64@npm:1.2.0":
version: 1.2.0
resolution: "turbo-freebsd-arm64@npm:1.2.0"
conditions: os=freebsd & cpu=arm64
languageName: node
linkType: hard

"turbo-linux-32@npm:1.1.10":
version: 1.1.10
resolution: "turbo-linux-32@npm:1.1.10"
"turbo-linux-32@npm:1.2.0":
version: 1.2.0
resolution: "turbo-linux-32@npm:1.2.0"
conditions: os=linux & cpu=ia32
languageName: node
linkType: hard

"turbo-linux-64@npm:1.1.10":
version: 1.1.10
resolution: "turbo-linux-64@npm:1.1.10"
"turbo-linux-64@npm:1.2.0":
version: 1.2.0
resolution: "turbo-linux-64@npm:1.2.0"
conditions: os=linux & cpu=x64
languageName: node
linkType: hard

"turbo-linux-arm64@npm:1.1.10":
version: 1.1.10
resolution: "turbo-linux-arm64@npm:1.1.10"
"turbo-linux-arm64@npm:1.2.0":
version: 1.2.0
resolution: "turbo-linux-arm64@npm:1.2.0"
conditions: os=linux & cpu=arm64
languageName: node
linkType: hard

"turbo-linux-arm@npm:1.1.10":
version: 1.1.10
resolution: "turbo-linux-arm@npm:1.1.10"
"turbo-linux-arm@npm:1.2.0":
version: 1.2.0
resolution: "turbo-linux-arm@npm:1.2.0"
conditions: os=linux & cpu=arm
languageName: node
linkType: hard

"turbo-linux-mips64le@npm:1.1.10":
version: 1.1.10
resolution: "turbo-linux-mips64le@npm:1.1.10"
"turbo-linux-mips64le@npm:1.2.0":
version: 1.2.0
resolution: "turbo-linux-mips64le@npm:1.2.0"
conditions: os=linux & cpu=mips64el
languageName: node
linkType: hard

"turbo-linux-ppc64le@npm:1.1.10":
version: 1.1.10
resolution: "turbo-linux-ppc64le@npm:1.1.10"
"turbo-linux-ppc64le@npm:1.2.0":
version: 1.2.0
resolution: "turbo-linux-ppc64le@npm:1.2.0"
conditions: os=linux & cpu=ppc64
languageName: node
linkType: hard

"turbo-windows-32@npm:1.1.10":
version: 1.1.10
resolution: "turbo-windows-32@npm:1.1.10"
"turbo-windows-32@npm:1.2.0":
version: 1.2.0
resolution: "turbo-windows-32@npm:1.2.0"
conditions: os=win32 & cpu=ia32
languageName: node
linkType: hard

"turbo-windows-64@npm:1.1.10":
version: 1.1.10
resolution: "turbo-windows-64@npm:1.1.10"
"turbo-windows-64@npm:1.2.0":
version: 1.2.0
resolution: "turbo-windows-64@npm:1.2.0"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard

turbo@latest:
version: 1.1.10
resolution: "turbo@npm:1.1.10"
dependencies:
turbo-darwin-64: 1.1.10
turbo-darwin-arm64: 1.1.10
turbo-freebsd-64: 1.1.10
turbo-freebsd-arm64: 1.1.10
turbo-linux-32: 1.1.10
turbo-linux-64: 1.1.10
turbo-linux-arm: 1.1.10
turbo-linux-arm64: 1.1.10
turbo-linux-mips64le: 1.1.10
turbo-linux-ppc64le: 1.1.10
turbo-windows-32: 1.1.10
turbo-windows-64: 1.1.10
"turbo@npm:1.2.0":
version: 1.2.0
resolution: "turbo@npm:1.2.0"
dependencies:
turbo-darwin-64: 1.2.0
turbo-darwin-arm64: 1.2.0
turbo-freebsd-64: 1.2.0
turbo-freebsd-arm64: 1.2.0
turbo-linux-32: 1.2.0
turbo-linux-64: 1.2.0
turbo-linux-arm: 1.2.0
turbo-linux-arm64: 1.2.0
turbo-linux-mips64le: 1.2.0
turbo-linux-ppc64le: 1.2.0
turbo-windows-32: 1.2.0
turbo-windows-64: 1.2.0
dependenciesMeta:
turbo-darwin-64:
optional: true
Expand Down Expand Up @@ -26652,7 +26652,7 @@ turbo@latest:
optional: true
bin:
turbo: bin/turbo
checksum: ba1c606f231ab50f8d8d457fe9fc8e7b59c88e2f8957b4c341aa96a807c96028554cd0f8aa7ba022ecf49248e0c14d4c055d3fb9faa7fea838e030209079bd20
checksum: a904a374d0157d26414b6902f164093efa4fc1d37a3a8475c9b7c998d246a1d075f0e934625c04765431d447a5f181a7455dc01febeb537d67688698260a4c04
languageName: node
linkType: hard

Expand Down

0 comments on commit 00cc675

Please sign in to comment.