Skip to content

Commit

Permalink
migrate to 6.x
Browse files Browse the repository at this point in the history
  • Loading branch information
juanpicado committed Sep 14, 2024
1 parent 4da9281 commit 5122f39
Show file tree
Hide file tree
Showing 14 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker-plugins-e2e.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-proxy-apache-e2e.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-proxy-nginx-e2e.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e-ci.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e-ui-ci.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/smok-test-docker.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/update-canary.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: update canary dependency 5.x
name: update canary dependency 6.x

on:
workflow_dispatch:
Expand All @@ -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

Expand Down Expand Up @@ -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: [email protected]
author_name: verdacciobot
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/apache-verdaccio/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-build-install-plugin/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-e2e-ui/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
FROM verdaccio/verdaccio:5.x-next
FROM verdaccio/verdaccio:6.x-next
ADD docker.yaml /verdaccio/conf/config.yaml
2 changes: 1 addition & 1 deletion docker/proxy-nginx/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"private": true,
"name": "e2e-5.x",
"name": "e2e-6.x",
"author": {
"name": "Verdaccio Maintainers",
"email": "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion tools/cli-commons/tests/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5122f39

Please sign in to comment.