From 5122f3914ba4ac6e11e4faf1483d7aeacb88ad97 Mon Sep 17 00:00:00 2001 From: Juan Picado Date: Sat, 14 Sep 2024 19:14:16 +0200 Subject: [PATCH] migrate to 6.x --- .github/workflows/docker-plugins-e2e.yml | 4 ++-- .github/workflows/docker-proxy-apache-e2e.yml | 4 ++-- .github/workflows/docker-proxy-nginx-e2e.yml | 4 ++-- .github/workflows/e2e-ci.yml | 4 ++-- .github/workflows/e2e-ui-ci.yml | 4 ++-- .github/workflows/smok-test-docker.yml | 4 ++-- .github/workflows/update-canary.yml | 8 ++++---- README.md | 6 +++--- docker/apache-verdaccio/docker-compose.yaml | 2 +- docker/docker-build-install-plugin/Dockerfile | 2 +- docker/docker-e2e-ui/Dockerfile | 2 +- docker/proxy-nginx/docker-compose.yaml | 2 +- package.json | 2 +- tools/cli-commons/tests/config.yaml | 2 +- 14 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/docker-plugins-e2e.yml b/.github/workflows/docker-plugins-e2e.yml index 1f1e480..80b9bda 100644 --- a/.github/workflows/docker-plugins-e2e.yml +++ b/.github/workflows/docker-plugins-e2e.yml @@ -1,11 +1,11 @@ -name: E2E Docker Proxy Plugins Test 5.x +name: E2E Docker Proxy Plugins Test 6.x on: workflow_dispatch: pull_request: push: branches: - - 5.x + - 6.x jobs: docker: timeout-minutes: 10 diff --git a/.github/workflows/docker-proxy-apache-e2e.yml b/.github/workflows/docker-proxy-apache-e2e.yml index 99fc314..034b18d 100644 --- a/.github/workflows/docker-proxy-apache-e2e.yml +++ b/.github/workflows/docker-proxy-apache-e2e.yml @@ -1,11 +1,11 @@ -name: E2E Docker Proxy Apache Test 5.x +name: E2E Docker Proxy Apache Test 6.x on: workflow_dispatch: pull_request: push: branches: - - 5.x + - 6.x jobs: docker: timeout-minutes: 10 diff --git a/.github/workflows/docker-proxy-nginx-e2e.yml b/.github/workflows/docker-proxy-nginx-e2e.yml index a60deb9..9a1b676 100644 --- a/.github/workflows/docker-proxy-nginx-e2e.yml +++ b/.github/workflows/docker-proxy-nginx-e2e.yml @@ -1,11 +1,11 @@ -name: E2E Docker Proxy Nginx Test 5.x +name: E2E Docker Proxy Nginx Test 6.x on: workflow_dispatch: pull_request: push: branches: - - 5.x + - 6.x jobs: docker: timeout-minutes: 10 diff --git a/.github/workflows/e2e-ci.yml b/.github/workflows/e2e-ci.yml index 8400d16..e355480 100644 --- a/.github/workflows/e2e-ci.yml +++ b/.github/workflows/e2e-ci.yml @@ -1,11 +1,11 @@ -name: E2E CLI 5.x +name: E2E CLI 6.x on: workflow_dispatch: pull_request: push: branches: - - 5.x + - 6.x permissions: contents: read jobs: diff --git a/.github/workflows/e2e-ui-ci.yml b/.github/workflows/e2e-ui-ci.yml index 4c27913..2734e73 100644 --- a/.github/workflows/e2e-ui-ci.yml +++ b/.github/workflows/e2e-ui-ci.yml @@ -1,11 +1,11 @@ -name: E2E Docker UI Cypress 5.x +name: E2E Docker UI Cypress 6.x on: workflow_dispatch: pull_request: push: branches: - - 5.x + - 6.x jobs: docker: timeout-minutes: 10 diff --git a/.github/workflows/smok-test-docker.yml b/.github/workflows/smok-test-docker.yml index 04edb3d..2305b96 100644 --- a/.github/workflows/smok-test-docker.yml +++ b/.github/workflows/smok-test-docker.yml @@ -1,9 +1,9 @@ -name: Docker Smoke Test 5.x +name: Docker Smoke Test 6.x on: workflow_dispatch: push: branches: - - 5.x + - 6.x permissions: contents: read jobs: diff --git a/.github/workflows/update-canary.yml b/.github/workflows/update-canary.yml index 103811b..e43ef34 100644 --- a/.github/workflows/update-canary.yml +++ b/.github/workflows/update-canary.yml @@ -1,5 +1,5 @@ --- -name: update canary dependency 5.x +name: update canary dependency 6.x on: workflow_dispatch: @@ -9,7 +9,7 @@ on: # for now, scheduled, we can enable on push master but not make much sense now push: branches: - - 5.x + - 6.x permissions: write-all @@ -42,7 +42,7 @@ jobs: uses: actions-js/push@156f2b10c3aa000c44dbe75ea7018f32ae999772 # tag=v1.4 with: github_token: ${{ secrets.TOKEN_VERDACCIOBOT_V2 }} - message: 'chore: updated canary verdaccio canary 5.x' - branch: 5.x + message: 'chore: updated canary verdaccio canary 6.x' + branch: 6.x author_email: verdaccio.npm@gmail.com author_name: verdacciobot diff --git a/README.md b/README.md index 8869ce3..e7b23be 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ -# E2E CLI Testing for 5.x +# E2E CLI Testing for 6.x What is included on these test? ## With Cypress -- Test the UI fo latest 5.x branch docker image +- Test the UI fo latest 6.x branch docker image ## With docker (docker compose) -> It uses the image `verdaccio/verdaccio:nightly-master`, latest `5.x` branch changes +> It uses the image `verdaccio/verdaccio:nightly-master`, latest `6.x` branch changes - nginx proxy - apache proxy diff --git a/docker/apache-verdaccio/docker-compose.yaml b/docker/apache-verdaccio/docker-compose.yaml index bc60548..e77cd97 100644 --- a/docker/apache-verdaccio/docker-compose.yaml +++ b/docker/apache-verdaccio/docker-compose.yaml @@ -2,7 +2,7 @@ version: '2' services: verdaccio: - image: verdaccio/verdaccio:5.x-next + image: verdaccio/verdaccio:6.x-next container_name: verdaccio ports: - '4873:4873' diff --git a/docker/docker-build-install-plugin/Dockerfile b/docker/docker-build-install-plugin/Dockerfile index f5bfa8d..f61036f 100644 --- a/docker/docker-build-install-plugin/Dockerfile +++ b/docker/docker-build-install-plugin/Dockerfile @@ -1,4 +1,4 @@ -FROM verdaccio/verdaccio:5.x-next +FROM verdaccio/verdaccio:6.x-next ADD docker.yaml /verdaccio/conf/config.yaml USER root RUN npm install --global verdaccio-static-token \ diff --git a/docker/docker-e2e-ui/Dockerfile b/docker/docker-e2e-ui/Dockerfile index ea28e16..1e9944e 100644 --- a/docker/docker-e2e-ui/Dockerfile +++ b/docker/docker-e2e-ui/Dockerfile @@ -1,2 +1,2 @@ -FROM verdaccio/verdaccio:5.x-next +FROM verdaccio/verdaccio:6.x-next ADD docker.yaml /verdaccio/conf/config.yaml diff --git a/docker/proxy-nginx/docker-compose.yaml b/docker/proxy-nginx/docker-compose.yaml index 488dcc3..ca98301 100644 --- a/docker/proxy-nginx/docker-compose.yaml +++ b/docker/proxy-nginx/docker-compose.yaml @@ -2,7 +2,7 @@ version: '2' services: verdaccio: - image: verdaccio/verdaccio:5.x-next + image: verdaccio/verdaccio:6.x-next container_name: verdaccio_root_path ports: - '4873:4873' diff --git a/package.json b/package.json index 3b3ced6..6a248e6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "name": "e2e-5.x", + "name": "e2e-6.x", "author": { "name": "Verdaccio Maintainers", "email": "verdaccio.npm@gmail.com" diff --git a/tools/cli-commons/tests/config.yaml b/tools/cli-commons/tests/config.yaml index dabca7a..1027d27 100644 --- a/tools/cli-commons/tests/config.yaml +++ b/tools/cli-commons/tests/config.yaml @@ -4,7 +4,7 @@ # improve security. # # Look here for more config file examples: -# https://github.com/verdaccio/verdaccio/tree/5.x/packages/config/src/conf/default.yaml +# https://github.com/verdaccio/verdaccio/tree/6.x/packages/config/src/conf/default.yaml # # Read about the best practices # https://verdaccio.org/docs/best