diff --git a/.github/workflows/docker-plugins-e2e.yml b/.github/workflows/docker-plugins-e2e.yml index 1e48ff6..d159d50 100644 --- a/.github/workflows/docker-plugins-e2e.yml +++ b/.github/workflows/docker-plugins-e2e.yml @@ -1,4 +1,4 @@ -name: E2E Docker Proxy Plugins Test 6.x +name: E2E Docker Proxy Plugins Test on: workflow_dispatch: @@ -10,14 +10,14 @@ on: jobs: docker: timeout-minutes: 10 - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 - name: Start containers - run: docker-compose -f "./docker/docker-build-install-plugin/docker-compose.yaml" up -d --build + run: docker compose -f "./docker/docker-build-install-plugin/docker-compose.yaml" up -d --build - name: Install node uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3 @@ -35,4 +35,4 @@ jobs: - name: Stop containers if: always() - run: docker-compose -f "./docker/docker-build-install-plugin/docker-compose.yaml" down + run: docker compose -f "./docker/docker-build-install-plugin/docker-compose.yaml" down diff --git a/.github/workflows/docker-proxy-apache-e2e.yml b/.github/workflows/docker-proxy-apache-e2e.yml index 281b7b5..95d28ba 100644 --- a/.github/workflows/docker-proxy-apache-e2e.yml +++ b/.github/workflows/docker-proxy-apache-e2e.yml @@ -1,4 +1,4 @@ -name: E2E Docker Proxy Apache Test 6.x +name: E2E Docker Proxy Apache Test on: workflow_dispatch: pull_request: @@ -9,14 +9,14 @@ on: jobs: docker: timeout-minutes: 10 - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 - name: Start containers - run: docker-compose -f "./docker/apache-verdaccio/docker-compose.yaml" up -d --build + run: docker compose -f "./docker/apache-verdaccio/docker-compose.yaml" up -d --build - name: Install node uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3 @@ -33,4 +33,4 @@ jobs: - name: Stop containers if: always() - run: docker-compose -f "./docker/apache-verdaccio/docker-compose.yaml" down + run: docker compose -f "./docker/apache-verdaccio/docker-compose.yaml" down diff --git a/.github/workflows/docker-proxy-nginx-e2e.yml b/.github/workflows/docker-proxy-nginx-e2e.yml index d3958c0..2f9e675 100644 --- a/.github/workflows/docker-proxy-nginx-e2e.yml +++ b/.github/workflows/docker-proxy-nginx-e2e.yml @@ -1,4 +1,4 @@ -name: E2E Docker Proxy Nginx Test 6.x +name: E2E Docker Proxy Nginx Test on: workflow_dispatch: @@ -10,14 +10,14 @@ on: jobs: docker: timeout-minutes: 10 - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 - name: Start containers - run: docker-compose -f "./docker/proxy-nginx/docker-compose.yaml" up -d --build + run: docker compose -f "./docker/proxy-nginx/docker-compose.yaml" up -d --build - name: Install node uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3 @@ -40,4 +40,4 @@ jobs: - name: Stop containers if: always() - run: docker-compose -f "./docker/proxy-nginx/docker-compose.yaml" down + run: docker compose -f "./docker/proxy-nginx/docker-compose.yaml" down diff --git a/.github/workflows/e2e-ci.yml b/.github/workflows/e2e-ci.yml index 3cd730a..8d38c81 100644 --- a/.github/workflows/e2e-ci.yml +++ b/.github/workflows/e2e-ci.yml @@ -1,4 +1,4 @@ -name: E2E CLI 6.x +name: E2E CLI on: workflow_dispatch: diff --git a/.github/workflows/e2e-ui-ci.yml b/.github/workflows/e2e-ui-ci.yml index 64b430c..eefa403 100644 --- a/.github/workflows/e2e-ui-ci.yml +++ b/.github/workflows/e2e-ui-ci.yml @@ -1,4 +1,4 @@ -name: E2E Docker UI Cypress 6.x +name: E2E Docker UI Cypress on: workflow_dispatch: diff --git a/.github/workflows/smok-test-docker.yml b/.github/workflows/smok-test-docker.yml index cec199b..3d9d0c6 100644 --- a/.github/workflows/smok-test-docker.yml +++ b/.github/workflows/smok-test-docker.yml @@ -1,4 +1,4 @@ -name: Docker Smoke Test 6.x +name: Docker Smoke Test on: workflow_dispatch: push: diff --git a/.github/workflows/update-canary.yml b/.github/workflows/update-canary.yml index c248c95..7ee0f05 100644 --- a/.github/workflows/update-canary.yml +++ b/.github/workflows/update-canary.yml @@ -35,7 +35,7 @@ jobs: - name: install run: pnpm install - name: update to latest canary - run: cd tools/cli-commons && pnpm install verdaccio@canary-6x + run: cd tools/cli-commons && pnpm install verdaccio@canary-7x - name: restore .npmrc run: git checkout .npmrc - name: Commit & Push changes diff --git a/README.md b/README.md index 6cb8193..59a658e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# E2E CLI Testing for 6.x +# E2E CLI Testing for Master Branch > For 5.x versions, check `5.x` branch @@ -6,7 +6,7 @@ What is included on these test? ## With Cypress -- Test the UI fo latest 6.x branch docker image +- Test the UI fo latest master branch docker image ## With docker (docker compose)