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

Update to yarn 4 #3887

Merged
merged 53 commits into from
Jan 9, 2025
Merged

Update to yarn 4 #3887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
0c3126c
update to yarn 4
sotojn Dec 19, 2024
83bcbff
add yarn 4 setup step to publish-master.yml
sotojn Dec 19, 2024
67e8af9
add yarn 4 setup step to publish-tag.yml
sotojn Dec 19, 2024
90dfbe4
add yarn 4 setup step to test.yml
sotojn Dec 19, 2024
2af4b49
add hash to fixed workflow links for ci
sotojn Dec 19, 2024
e9d8d11
add yarn install step to yarn install
sotojn Dec 19, 2024
21dd0a0
change workflows hash
sotojn Dec 19, 2024
782b15b
temporarily disable yarn cache in ci
sotojn Jan 2, 2025
8e32950
update workflow hash
sotojn Jan 2, 2025
df35580
replace patch-package with built in yarn patch
sotojn Jan 3, 2025
0e552f1
add jest and scripts as dev deps in e2e
sotojn Jan 3, 2025
00189dd
add yarn 4 to Dockerfile
sotojn Jan 3, 2025
be8fea6
remove patches folder in Dockerfile
sotojn Jan 3, 2025
41030d6
remove obsolete yarn setup args in ci
sotojn Jan 3, 2025
fccedc8
add yarn command to install step ci
sotojn Jan 6, 2025
792de7f
revert yarn installaddition to ci
sotojn Jan 6, 2025
29b4776
fix pre and post build steps in yarn
sotojn Jan 6, 2025
571aae1
fix test-commands in ci
sotojn Jan 6, 2025
2347a92
fix teraslice-cli yarn test
sotojn Jan 6, 2025
08de6d3
remove install-state.gz file
sotojn Jan 6, 2025
d84bbf4
add install-state.gz to gitignore
sotojn Jan 6, 2025
3816be5
fix yarnlock after rebase
sotojn Jan 6, 2025
147c119
update workflows with test hash
sotojn Jan 6, 2025
694ffe5
remove invalid yarn args from dockerfile dev
sotojn Jan 6, 2025
d9c81a9
fix teraslice-cli tests
sotojn Jan 7, 2025
a10a2cf
refactor test scripts for all packages
sotojn Jan 7, 2025
71badda
run yarn sync
sotojn Jan 7, 2025
abbc27d
fix broken yarn.lock after rebase
sotojn Jan 7, 2025
9bb75b9
fix teraslice yarn install and add install-state.gz file to git ignore
sotojn Jan 7, 2025
7447bbe
fix dockerfile from removing src files
sotojn Jan 7, 2025
2178868
add packageManager to earl test asset package.json
sotojn Jan 7, 2025
e3185f0
fix fixture asset yarn structure in teraslice-cli
sotojn Jan 8, 2025
fa6a2d2
update website repo to yarn 4
sotojn Jan 8, 2025
73d6ec9
add docs on how to update yarn
sotojn Jan 8, 2025
de11083
add test workflow
sotojn Jan 8, 2025
bbd9c22
update yarn upgrade docs
sotojn Jan 8, 2025
0e9e0eb
update to yarn 4.6.0
sotojn Jan 8, 2025
25f749d
update yarn upgrade docs to include dockerfile step
sotojn Jan 8, 2025
92f977f
update Dockerfile to use yarn 4.6.0
sotojn Jan 8, 2025
2c4838e
update ci yamls to install yarn 4.6.0
sotojn Jan 8, 2025
0e0b7be
bump: (patch) @terascope/data-mate@1.7.1, elasticsearch-store@1.7.1
sotojn Jan 8, 2025
8e036e1
update yanr.lock file
sotojn Jan 8, 2025
502ce4b
release: (minor) teraslice@2.12.0
sotojn Jan 8, 2025
cac1b64
add --inline-builds flag to ci for yarn install
sotojn Jan 8, 2025
8594963
add yarn release binary
sotojn Jan 8, 2025
ca9bd93
remove yarn 4 install step
sotojn Jan 8, 2025
6728d0d
re-enable yarn cache in ci
sotojn Jan 8, 2025
a45eaea
replace test workflow hash with new test workflows
sotojn Jan 8, 2025
4485b39
update yarn update docs to reflect changes in steps
sotojn Jan 8, 2025
9c471e8
remove yarn 4 activation steps in Dockerfile
sotojn Jan 8, 2025
a83fdc7
replace workflow hashes again
sotojn Jan 8, 2025
1c59a3c
add merged workflow hash from workflows
sotojn Jan 8, 2025
dbc802b
enable yarn hardened mode only on verfiy-build step in ci
sotojn Jan 9, 2025
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/daily-docker-cache.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ on:

jobs:
call-refresh-docker-cache-workflow:
uses: terascope/workflows/.github/workflows/refresh-docker-cache.yml@f5e098fa861fe7744fa61842e82124f806364be9
uses: terascope/workflows/.github/workflows/refresh-docker-cache.yml@f86f716e47d989b939d978befa7721c1f5b10134
secrets: inherit
4 changes: 1 addition & 3 deletions .github/workflows/publish-master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@ jobs:
cache: 'yarn'

- name: Install and build packages
run: yarn setup
env:
YARN_SETUP_ARGS: "--prod=false --silent"
run: yarn && yarn setup

- name: Publish to npm
run: yarn ts-scripts publish -t latest npm
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/publish-tag.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ jobs:
cache: 'yarn'

- name: Install and build packages
run: yarn setup
env:
YARN_SETUP_ARGS: "--prod=false --silent"
run: yarn && yarn setup
sotojn marked this conversation as resolved.
Show resolved Hide resolved

- name: Publish to npm
run: yarn ts-scripts publish -t tag npm
Expand Down Expand Up @@ -58,9 +56,7 @@ jobs:
cache: 'yarn'

- name: Install and build packages
run: yarn setup
env:
YARN_SETUP_ARGS: "--prod=false --silent"
run: yarn && yarn setup
lesleydreyer marked this conversation as resolved.
Show resolved Hide resolved

- name: Publish to docker
run: yarn ts-scripts publish -t tag -n ${{ matrix.node-version }} docker
68 changes: 23 additions & 45 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,15 @@ jobs:
cache: 'yarn'

- name: Install and build packages
run: yarn setup
env:
YARN_SETUP_ARGS: "--prod=false"
run: YARN_ENABLE_HARDENED_MODE=1 yarn && yarn setup

check-docker-limit-before:
uses: terascope/workflows/.github/workflows/check-docker-limit.yml@f5e098fa861fe7744fa61842e82124f806364be9
uses: terascope/workflows/.github/workflows/check-docker-limit.yml@f86f716e47d989b939d978befa7721c1f5b10134
secrets: inherit

cache-docker-images:
needs: check-docker-limit-before
uses: terascope/workflows/.github/workflows/cache-docker-images.yml@f5e098fa861fe7744fa61842e82124f806364be9
uses: terascope/workflows/.github/workflows/cache-docker-images.yml@f86f716e47d989b939d978befa7721c1f5b10134
secrets: inherit

linux-unit-tests:
Expand All @@ -71,12 +69,10 @@ jobs:
cache: 'yarn'

- name: Install and build packages
run: yarn setup
env:
YARN_SETUP_ARGS: "--prod=false"
run: yarn && yarn setup

- name: Test
run: yarn --silent test -- --suite unit --
run: yarn test --suite unit --

teraslice-elasticsearch-tests:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -105,9 +101,7 @@ jobs:
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Install and build packages
run: yarn setup
env:
YARN_SETUP_ARGS: "--prod=false"
run: yarn && yarn setup

- name: Create Docker Image List
run: |
Expand All @@ -122,7 +116,7 @@ jobs:
key: docker-images-${{ hashFiles('./images/image-list.txt') }}

- name: Test ${{ matrix.search-version }}
run: yarn --silent test:${{ matrix.search-version }}
run: yarn test:${{ matrix.search-version }}
working-directory: ./packages/teraslice

elasticsearch-store-tests:
Expand Down Expand Up @@ -152,9 +146,7 @@ jobs:
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Install and build packages
run: yarn setup
env:
YARN_SETUP_ARGS: "--prod=false"
run: yarn && yarn setup

- name: Create Docker Image List
run: |
Expand All @@ -169,7 +161,7 @@ jobs:
key: docker-images-${{ hashFiles('./images/image-list.txt') }}

- name: Test ${{ matrix.search-version }}
run: yarn --silent test:${{ matrix.search-version }}
run: yarn test:${{ matrix.search-version }}
working-directory: ./packages/elasticsearch-store

lint-and-sync:
Expand All @@ -188,9 +180,7 @@ jobs:
cache: 'yarn'

- name: Install and build packages
run: yarn setup
env:
YARN_SETUP_ARGS: "--prod=false"
run: yarn && yarn setup

- name: Lint codebase
run: yarn lint
Expand Down Expand Up @@ -225,9 +215,7 @@ jobs:
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Install and build packages
run: yarn setup
env:
YARN_SETUP_ARGS: "--prod=false"
run: yarn && yarn setup

- name: Create Docker Image List
run: |
Expand All @@ -242,7 +230,7 @@ jobs:
key: docker-images-${{ hashFiles('./images/image-list.txt') }}

- name: Test ${{ matrix.search-version }}
run: yarn --silent test:${{ matrix.search-version }}
run: yarn test:${{ matrix.search-version }}
working-directory: ./packages/elasticsearch-api

e2e-tests:
Expand Down Expand Up @@ -272,9 +260,7 @@ jobs:
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Install and build packages
run: yarn setup
env:
YARN_SETUP_ARGS: "--prod=false"
run: yarn && yarn setup

- name: Create Docker Image List
run: |
Expand All @@ -293,7 +279,7 @@ jobs:
working-directory: ./e2e

- name: Test ${{ matrix.search-version }}
run: NODE_VERSION=${{ matrix.node-version }} yarn --silent test:${{ matrix.search-version }}
run: NODE_VERSION=${{ matrix.node-version }} yarn test:${{ matrix.search-version }}
working-directory: ./e2e

e2e-k8s-tests:
Expand Down Expand Up @@ -322,9 +308,7 @@ jobs:
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Install and build packages
run: yarn setup
env:
YARN_SETUP_ARGS: "--prod=false"
run: yarn && yarn setup

- name: Create Docker Image List
run: |
Expand All @@ -348,7 +332,7 @@ jobs:
install_only: "true"

- name: Test k8s elasticsearch7
run: NODE_VERSION=${{ matrix.node-version }} yarn --silent test:k8s
run: NODE_VERSION=${{ matrix.node-version }} yarn test:k8s
working-directory: ./e2e

e2e-k8s-v2-tests:
Expand Down Expand Up @@ -377,9 +361,7 @@ jobs:
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Install and build packages
run: yarn setup
env:
YARN_SETUP_ARGS: "--prod=false"
run: yarn && yarn setup

- name: Create Docker Image List
run: |
Expand All @@ -403,7 +385,7 @@ jobs:
install_only: "true"

- name: Test k8s V2 elasticsearch7
run: NODE_VERSION=${{ matrix.node-version }} yarn --silent test:k8sV2
run: NODE_VERSION=${{ matrix.node-version }} yarn test:k8sV2
working-directory: ./e2e

e2e-external-storage-tests:
Expand Down Expand Up @@ -432,9 +414,7 @@ jobs:
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Install and build packages
run: yarn setup
env:
YARN_SETUP_ARGS: "--prod=false"
run: yarn && yarn setup

- name: Create Docker Image List
run: |
Expand All @@ -453,7 +433,7 @@ jobs:
working-directory: ./e2e

- name: Test external Asset Storage opensearch1
run: NODE_VERSION=${{ matrix.node-version }} yarn --silent test:s3AssetStorage
run: NODE_VERSION=${{ matrix.node-version }} yarn test:s3AssetStorage
working-directory: ./e2e

e2e-external-storage-tests-encrypted:
Expand Down Expand Up @@ -482,9 +462,7 @@ jobs:
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Install and build packages
run: yarn setup
env:
YARN_SETUP_ARGS: "--prod=false"
run: yarn && yarn setup

- name: Create Docker Image List
run: |
Expand Down Expand Up @@ -515,7 +493,7 @@ jobs:
working-directory: ./e2e

- name: Test external Asset Storage opensearch1
run: ENCRYPT_MINIO=true NODE_VERSION=${{ matrix.node-version }} yarn --silent test:s3AssetStorage
run: ENCRYPT_MINIO=true NODE_VERSION=${{ matrix.node-version }} yarn test:s3AssetStorage
working-directory: ./e2e

check-docker-limit-after:
Expand All @@ -529,5 +507,5 @@ jobs:
elasticsearch-store-tests,
teraslice-elasticsearch-tests
]
uses: terascope/workflows/.github/workflows/check-docker-limit.yml@f5e098fa861fe7744fa61842e82124f806364be9
uses: terascope/workflows/.github/workflows/check-docker-limit.yml@f86f716e47d989b939d978befa7721c1f5b10134
secrets: inherit
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,13 @@ webiste/.cache-loader
website/build/
website/node_modules
website/i18n/*
website/.yarn/install-state.gz
docs/packages/*/api

.ts-test-config

# CI test files
images/*

# .yarn
.yarn/install-state.gz
8 changes: 4 additions & 4 deletions patches/jest-config+29.7.0.patch → ...s/jest-config-npm-29.7.0-97d8544d74.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff --git a/node_modules/jest-config/build/ValidConfig.js b/node_modules/jest-config/build/ValidConfig.js
index 0c1250c..67e586e 100644
--- a/node_modules/jest-config/build/ValidConfig.js
+++ b/node_modules/jest-config/build/ValidConfig.js
diff --git a/build/ValidConfig.js b/build/ValidConfig.js
index 0c1250c4da55984ef3ef0befb3bbf3c2133fe912..67e586e0f664629e18553927325f912c1b25a409 100644
--- a/build/ValidConfig.js
+++ b/build/ValidConfig.js
@@ -331,6 +331,7 @@ const initialProjectOptions = {
['/__tests__/\\.test\\.[jt]sx?$', '/__tests__/\\.spec\\.[jt]sx?$']
),
Expand Down
Loading
Loading