diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 68c03ec7..00000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,9 +0,0 @@ -# Please see the documentation for all configuration options: -# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates - -version: 2 -updates: - - package-ecosystem: "github-actions" - directory: "/" # Location of .github - schedule: - interval: "daily" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 267a4ff1..90092c16 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,7 +75,7 @@ jobs: with: github-token: ${{ secrets.GITHUB_TOKEN }} script: | - const SELENIUM_BROWSERS = ["chrome", "firefox"]; + const SELENIUM_BROWSERS = ["chrome:3.141.59-20200525", "firefox:3.141.59-20200525"]; const BROWSERSTACK_BROWSERS = [{ browserName: "safari", browser_version: "13.1", @@ -87,10 +87,10 @@ jobs: // running selenium doesn't require access to secrets if (context.eventName !== "pull_request_target") { - include.push(...SELENIUM_BROWSERS.map(name => ({ - browser: name, + include.push(...SELENIUM_BROWSERS.map(browserTag => ({ + browser: browserTag.split(':')[0], services: {selenium: { - image: `selenium/standalone-${name}:3.141.59-20200525`, + image: `selenium/standalone-${browserTag}`, ports: ["4444:4444"], }}, }))); diff --git a/dockers/screenshotter/screenshotter.sh b/dockers/screenshotter/screenshotter.sh index d577221e..f69a75b6 100755 --- a/dockers/screenshotter/screenshotter.sh +++ b/dockers/screenshotter/screenshotter.sh @@ -17,7 +17,7 @@ cleanup() { container= trap cleanup EXIT status=0 -for browserTag in firefox:3.141.59-20200525 chrome:3.141.59-20200525; do +for browserTag in "firefox:3.141.59-20200525" "chrome:3.141.59-20200525"; do browser=${browserTag%:*} image=selenium/standalone-${browserTag} echo "Starting container for ${image}" diff --git a/renovate.json b/renovate.json index 02ee2edd..845a015c 100644 --- a/renovate.json +++ b/renovate.json @@ -7,8 +7,7 @@ "group:linters" ], "git-submodules": { - "enabled": true, - "automerge": false + "enabled": true }, "lockFileMaintenance": { "enabled": true, @@ -16,13 +15,40 @@ "stabilityDays": 0, "dependencyDashboardApproval": true }, - "includePaths": [ - "package.json", - "website/package.json", - ".gitmodules" + "ignorePaths": ["dockers/texcmp/"], + "regexManagers": [ + { + "fileMatch": ["^\\.github/workflows/[^/]+\\.ya?ml$"], + "matchStrings": ["uses: (?.*?)@(?.*?)\\s"], + "datasourceTemplate": "github-tags", + "versioningTemplate": "regex:^v(?\\d+)$" + }, + { + "fileMatch": [ + "^\\.github/workflows/ci\\.yml$", + "^dockers/screenshotter/screenshotter\\.sh$" + ], + "matchStrings": ["\"(?[a-z]*):(?[\\d.\\-]*)\""], + "datasourceTemplate": "docker", + "depNameTemplate": "selenium/standalone-{{browserTag}}", + "versioningTemplate": "regex:^3\\.141\\.59-(?\\d+)$" + }, { + "fileMatch": ["^\\.flowconfig$"], + "matchStrings": ["\\[version\\]\\s*(?.*?)\\s"], + "datasourceTemplate": "npm", + "depNameTemplate": "flow-bin" + }, { + "fileMatch": ["^\\.yarn/sdks/[^/]+/package\\.json$"], + "matchStrings": ["\"name\": \"(?.*?)\",\\s*\"version\": \"(?.*?)-pnpify\""], + "datasourceTemplate": "npm" + } ], "stabilityDays": 3, "rangeStrategy": "update-lockfile", - "commitBody": "[skip netlify]", - "postUpdateOptions": ["yarnDedupeHighest"] + "commitMessageSuffix": "[skip netlify]", + "postUpdateOptions": ["yarnDedupeHighest"], + "packageRules": [{ + "paths": ["website/**"], + "commitMessageSuffix": "" + }] }