diff --git a/.github/workflows/a11y.yaml b/.github/workflows/a11y.yaml index 422a6e9f93..43351e0573 100644 --- a/.github/workflows/a11y.yaml +++ b/.github/workflows/a11y.yaml @@ -29,7 +29,7 @@ env: jobs: a11y: - runs-on: ubuntu-latest + runs-on: [self-hosted, master] steps: - uses: actions/checkout@v2 with: @@ -48,13 +48,11 @@ jobs: distribution: 'zulu' java-version: '17' - - name: Install google chrome - shell: bash + - name: Install google chrome run: | - wget -q https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_114.0.5735.90-1_amd64.deb + wget https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_114.0.5735.90-1_amd64.deb apt install -y --allow-downgrades ./google-chrome-stable_114.0.5735.90-1_amd64.deb - ln -s /usr/bin/google-chrome /usr/bin/chrome - chrome --version + apt chrome --version - name: 'Update settings.xml with server configuration' run: | diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml deleted file mode 100644 index 87e8cae869..0000000000 --- a/.github/workflows/action.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: 'Install Google Chrome' -description: 'Install Google Chrome' - -on: - pull_request: - branches: - - maintenance-3.1.x - workflow_call: - inputs: - branch: - description: 'The current branch' - default: maintenance-3.1.x - type: string - required: false - secrets: - NPM_PACKAGES_TOKEN: - description: 'NPM_PACKAGES_TOKEN' - required: true - PACKAGES_AUTH_USER: - description: 'PACKAGES_AUTH_USER' - required: true - PACKAGES_AUTH_TOKEN: - description: 'PACKAGES_AUTH_TOKEN' - required: true - -env: - REFERENCE_BRANCH: maintenance-3.1.x - NPM_REPOSITORY: https://packages.nuxeo.com/repository/npm-public/ - BRANCH_NAME: ${{ github.head_ref || inputs.branch || 'maintenance-3.1.x' }} - -jobs: - action: - runs: - using: 'composite' - steps: - - name: Install google chrome - shell: bash - run: | - wget -q https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_114.0.5735.90-1_amd64.deb - sudo apt install -y --allow-downgrades ./google-chrome-stable_114.0.5735.90-1_amd64.deb - sudo ln -s /usr/bin/google-chrome /usr/bin/chrome - chrome --version diff --git a/.github/workflows/ftest.yaml b/.github/workflows/ftest.yaml index dab3c00cef..e01733dbf1 100644 --- a/.github/workflows/ftest.yaml +++ b/.github/workflows/ftest.yaml @@ -45,13 +45,11 @@ jobs: distribution: 'zulu' java-version: '17' - - name: Install google chrome - shell: bash + - name: Install google chrome run: | - wget -q https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_114.0.5735.90-1_amd64.deb - apt install -y --allow-downgrades ./google-chrome-stable_114.0.5735.90-1_amd64.deb - ln -s /usr/bin/google-chrome /usr/bin/chrome -f - chrome --version + wget -q https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_114.0.5735.90-1_amd64.deb + apt install -y --allow-downgrades ./google-chrome-stable_114.0.5735.90-1_amd64.deb + apt chrome --version - name: Determine nuxeo-elements branch to link id: pick_nuxeo_elements_branch diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 5dc944ac1c..6960e4bb05 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -44,13 +44,13 @@ jobs: uses: nuxeo/nuxeo-web-ui/.github/workflows/ftest.yaml@maintenance-3.1.x secrets: NPM_PACKAGES_TOKEN: ${{ secrets.NPM_PACKAGES_TOKEN }} - PACKAGES_AUTH_USER: ${{ secrets.PACKAGES_AUTH_USER }} + PACKAGES_AUTH_USER: ${{ secrets.PACKAGES_AUTH_USER }}a PACKAGES_AUTH_TOKEN: ${{ secrets.PACKAGES_AUTH_TOKEN }} with: branch: maintenance-3.1.x build: - needs: [action, lint, test, a11y, ftest] + needs: [lint, test, a11y, ftest] runs-on: [self-hosted, master] steps: - uses: actions/checkout@v2 diff --git a/packages/nuxeo-web-ui-ftest/package.json b/packages/nuxeo-web-ui-ftest/package.json index 713bd41af1..df5c9ae0b2 100644 --- a/packages/nuxeo-web-ui-ftest/package.json +++ b/packages/nuxeo-web-ui-ftest/package.json @@ -21,7 +21,7 @@ "@cucumber/tag-expressions": "^2.0.4", "@wdio/cli": "7.20.5", "@wdio/cucumber-framework": "^7.20.3", - "@wdio/local-runner": "7.2.0", + "@wdio/local-runner": "7.32.4", "@wdio/selenium-standalone-service": "7.2.0", "@wdio/spec-reporter": "^7.2.0", "@wdio/sync": "^7.2.0", @@ -40,7 +40,7 @@ "multiple-cucumber-html-reporter": "^1.18.0", "node-fetch": "^2.6.1", "nuxeo": "^4.0.3", - "wdio-chromedriver-service": "7.0.0", + "wdio-chromedriver-service": "7.3.2", "wdio-cucumberjs-json-reporter": "^2.0.3", "webdriverio": "^7.2.0" } diff --git a/plugin/a11y/package.json b/plugin/a11y/package.json index 1ff998a236..e2a53ce366 100644 --- a/plugin/a11y/package.json +++ b/plugin/a11y/package.json @@ -15,10 +15,10 @@ "@babel/preset-env": "^7.15.0", "@babel/register": "^7.14.5", "@nuxeo/nuxeo-web-ui-ftest": "file:../../packages/nuxeo-web-ui-ftest", - "@wdio/cli": "^7.20.5", + "@wdio/cli": "7.20.5", "@wdio/local-runner": "^7.20.5", "@wdio/mocha-framework": "^7.2.0", - "@wdio/selenium-standalone-service": "^7.2.0", + "@wdio/selenium-standalone-service": "7.2.0", "@wdio/spec-reporter": "^7.2.0", "@wdio/sync": "^7.2.0", "axe-core": "^4.1.2", diff --git a/plugin/a11y/wdio.conf.js b/plugin/a11y/wdio.conf.js index fda939cc6d..d3d5ed6348 100644 --- a/plugin/a11y/wdio.conf.js +++ b/plugin/a11y/wdio.conf.js @@ -32,7 +32,7 @@ const options = { if (process.env.HEADLESS) { options.args.push('--window-size=1920,1080'); options.args.push('--single-process'); - // options.args.push('--headless'); + options.args.push('--headless'); options.args.push('--disable-gpu'); options.args.push('--disable-dev-shm-usage'); }