bump browserslist version

drone: use pre-made image with dependencies
a cron job builds hrfee/jfa-go-build-docker daily, which includes the apt dependencies for building.
2025-01-06 00:10:11 +00:00 · 2021-05-31 18:53:21 +01:00 · 2021-05-31 14:58:20 +01:00 · 2021-05-31 14:13:41 +01:00
6 changed files with 51 additions and 54 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -9,7 +9,7 @@ steps:
      commands:
          - git fetch --tags
    - name: release
-      image: golang:latest
+      image: hrfee/jfa-go-build-docker:latest
      volumes:
        - name: ssh_key
          path: /id_rsa
@ -19,11 +19,6 @@ steps:
          GITHUB_TOKEN:
              from_secret: github_token
      commands:
-        - apt-get update -y
-        - apt-get install build-essential python3-pip curl software-properties-common sed upx gcc libgtk-3-dev libappindicator3-dev gcc-mingw-w64-x86-64 -y
-        - (curl -sL https://deb.nodesource.com/setup_14.x | bash -)
-        - apt-get install nodejs
-
        - curl -sL https://git.io/goreleaser > ../goreleaser
        - chmod +x ../goreleaser
        - ./scripts/version.sh ../goreleaser
@ -81,23 +76,19 @@ type: docker

 steps:
    - name: build
-      image: golang:latest
+      image: hrfee/jfa-go-build-docker:latest
      volumes:
        - name: ssh_key
          path: /id_rsa
      commands:
-        - apt-get update -y
-        - apt-get install build-essential python3-pip curl software-properties-common sed upx gcc libgtk-3-dev libappindicator3-dev gcc-mingw-w64-x86-64 -y
-        - (curl -sL https://deb.nodesource.com/setup_14.x | bash -)
-        - apt-get install nodejs
        - curl -sL https://git.io/goreleaser > goreleaser
        - chmod +x goreleaser
        - ./scripts/version.sh ./goreleaser --snapshot --skip-publish --rm-dist
        - wget https://builds.hrfee.pw/upload.py
        - pip3 install requests
        - bash -c 'sftp -P 2022 -i /id_rsa -o StrictHostKeyChecking=no root@161.97.102.153:/repo/incoming <<< $"put dist/*.deb"'
-        - bash -c 'ssh -i /id_rsa root@161.97.102.153 -p 2022 "reprepro -Vb /repo remove trusty-unstable jfa-go"'
-        - bash -c 'ssh -i /id_rsa root@161.97.102.153 -p 2022 "reprepro -Vb /repo remove trusty-unstable jfa-go-tray"'
+          # - bash -c 'ssh -i /id_rsa root@161.97.102.153 -p 2022 "reprepro -Vb /repo remove trusty-unstable jfa-go"'
+          # - bash -c 'ssh -i /id_rsa root@161.97.102.153 -p 2022 "reprepro -Vb /repo remove trusty-unstable jfa-go-tray"'
        - bash -c 'ssh -i /id_rsa root@161.97.102.153 -p 2022 "repo-process-deb trusty"'
        - bash -c 'python3 upload.py https://builds.hrfee.pw hrfee jfa-go --upload ./dist/*.zip ./dist/*.rpm ./dist/*.apk --tag internal-git=true'
      environment:
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@ -101,7 +101,7 @@ archives:
 checksum:
    name_template: 'checksums.txt'
 snapshot:
-    name_template: "0.0.0-{{.ShortCommit}}"
+    name_template: "0{{.ShortCommit}}"
 changelog:
    sort: asc
    filters:
--- a/go.mod
+++ b/go.mod
@ -49,8 +49,8 @@ require (
 	github.com/writeas/go-strip-markdown v2.0.1+incompatible
 	golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9 // indirect
 	golang.org/x/net v0.0.0-20210525063256-abc453219eb5 // indirect
-	golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea // indirect
-	golang.org/x/tools v0.1.1 // indirect
+	golang.org/x/sys v0.0.0-20210531080801-fdfd190a6549 // indirect
+	golang.org/x/tools v0.1.2 // indirect
 	google.golang.org/protobuf v1.25.0 // indirect
 	gopkg.in/ini.v1 v1.62.0
 )
--- a/go.sum
+++ b/go.sum
@ -348,6 +348,8 @@ golang.org/x/sys v0.0.0-20210521203332-0cec03c779c1 h1:lCnv+lfrU9FRPGf8NeRuWAAPj
 golang.org/x/sys v0.0.0-20210521203332-0cec03c779c1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea h1:+WiDlPBBaO+h9vPNZi8uJ3k4BkKQB7Iow3aqwHVA5hI=
 golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210531080801-fdfd190a6549 h1:OL5GcZ2XPkte3dpfuFQ9o884vrE3BZQhajdntNMruv4=
+golang.org/x/sys v0.0.0-20210531080801-fdfd190a6549/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@ -373,6 +375,8 @@ golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.1 h1:wGiQel/hW0NnEkJUk8lbzkX2gFJU6PFxf1v5OlCfuOs=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.2 h1:kRBLX7v7Af8W7Gdbbc908OJcdgtK8bOz9Uaj8/F1ACA=
+golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
--- a/package-lock.json
+++ b/package-lock.json
@ -11,6 +11,7 @@
        "@ts-stack/markdown": "^1.3.0",
        "@types/node": "^15.0.1",
        "a17t": "^0.4.0",
+        "browserslist": "^4.16.6",
        "esbuild": "^0.8.57",
        "lodash": "^4.17.21",
        "mjml": "^4.8.0",
@ -100,15 +101,15 @@
      }
    },
    "node_modules/browserslist": {
-      "version": "4.16.0",
-      "resolved": "https://registry.npm.taobao.org/browserslist/download/browserslist-4.16.0.tgz?cache=0&sync_timestamp=1607665787496&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbrowserslist%2Fdownload%2Fbrowserslist-4.16.0.tgz",
-      "integrity": "sha1-QQJ3YnUAvjyyihv+A3WG++35SIs=",
+      "version": "4.16.6",
+      "resolved": "https://registry.nlark.com/browserslist/download/browserslist-4.16.6.tgz?cache=0&sync_timestamp=1619789155823&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbrowserslist%2Fdownload%2Fbrowserslist-4.16.6.tgz",
+      "integrity": "sha1-15ASd6WojlVO0wWxg+ybDAj2b6I=",
      "dependencies": {
-        "caniuse-lite": "^1.0.30001165",
-        "colorette": "^1.2.1",
-        "electron-to-chromium": "^1.3.621",
+        "caniuse-lite": "^1.0.30001219",
+        "colorette": "^1.2.2",
+        "electron-to-chromium": "^1.3.723",
        "escalade": "^3.1.1",
-        "node-releases": "^1.1.67"
+        "node-releases": "^1.1.71"
      },
      "bin": {
        "browserslist": "cli.js"
@ -127,9 +128,9 @@
      }
    },
    "node_modules/caniuse-lite": {
-      "version": "1.0.30001170",
-      "resolved": "https://registry.npm.taobao.org/caniuse-lite/download/caniuse-lite-1.0.30001170.tgz?cache=0&sync_timestamp=1608444166670&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcaniuse-lite%2Fdownload%2Fcaniuse-lite-1.0.30001170.tgz",
-      "integrity": "sha1-AIi/7MahRpSWnjkcwp1+tjYspqc="
+      "version": "1.0.30001231",
+      "resolved": "https://registry.nlark.com/caniuse-lite/download/caniuse-lite-1.0.30001231.tgz?cache=0&sync_timestamp=1622442631485&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcaniuse-lite%2Fdownload%2Fcaniuse-lite-1.0.30001231.tgz",
+      "integrity": "sha1-bB+bSfwnzDaLiU5kubKLOe+AYDs="
    },
    "node_modules/cheerio": {
      "version": "1.0.0-rc.3",
@ -167,9 +168,9 @@
      }
    },
    "node_modules/colorette": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npm.taobao.org/colorette/download/colorette-1.2.1.tgz?cache=0&sync_timestamp=1593955937807&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcolorette%2Fdownload%2Fcolorette-1.2.1.tgz",
-      "integrity": "sha1-TQuSEyXBT6+SYzCGpTbbbolWSxs="
+      "version": "1.2.2",
+      "resolved": "https://registry.npm.taobao.org/colorette/download/colorette-1.2.2.tgz?cache=0&sync_timestamp=1614259623635&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcolorette%2Fdownload%2Fcolorette-1.2.2.tgz",
+      "integrity": "sha1-y8x51emcrqLb8Q6zom/Ys+as+pQ="
    },
    "node_modules/commander": {
      "version": "2.20.3",
@ -260,9 +261,9 @@
      }
    },
    "node_modules/electron-to-chromium": {
-      "version": "1.3.633",
-      "resolved": "https://registry.npm.taobao.org/electron-to-chromium/download/electron-to-chromium-1.3.633.tgz?cache=0&sync_timestamp=1608750797791&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron-to-chromium%2Fdownload%2Felectron-to-chromium-1.3.633.tgz",
-      "integrity": "sha1-Ft1a7J3gOJTo0UodtM2oo2m5t/4="
+      "version": "1.3.742",
+      "resolved": "https://registry.nlark.com/electron-to-chromium/download/electron-to-chromium-1.3.742.tgz?cache=0&sync_timestamp=1622239519943&other_urls=https%3A%2F%2Fregistry.nlark.com%2Felectron-to-chromium%2Fdownload%2Felectron-to-chromium-1.3.742.tgz",
+      "integrity": "sha1-ciMhWsu9OlKEli68tt+F2IuV8gA="
    },
    "node_modules/entities": {
      "version": "1.1.2",
@ -1354,9 +1355,9 @@
      }
    },
    "node_modules/node-releases": {
-      "version": "1.1.67",
-      "resolved": "https://registry.npm.taobao.org/node-releases/download/node-releases-1.1.67.tgz?cache=0&sync_timestamp=1605581679207&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnode-releases%2Fdownload%2Fnode-releases-1.1.67.tgz",
-      "integrity": "sha1-KOv8zNC6pqrY6NTY/ky8Sa4jnBI="
+      "version": "1.1.72",
+      "resolved": "https://registry.nlark.com/node-releases/download/node-releases-1.1.72.tgz?cache=0&sync_timestamp=1620978623877&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnode-releases%2Fdownload%2Fnode-releases-1.1.72.tgz",
+      "integrity": "sha1-FIAqtrEDmnmgx9ZithClu9durL4="
    },
    "node_modules/normalize-path": {
      "version": "3.0.0",
@ -1743,15 +1744,15 @@
      }
    },
    "browserslist": {
-      "version": "4.16.0",
-      "resolved": "https://registry.npm.taobao.org/browserslist/download/browserslist-4.16.0.tgz?cache=0&sync_timestamp=1607665787496&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbrowserslist%2Fdownload%2Fbrowserslist-4.16.0.tgz",
-      "integrity": "sha1-QQJ3YnUAvjyyihv+A3WG++35SIs=",
+      "version": "4.16.6",
+      "resolved": "https://registry.nlark.com/browserslist/download/browserslist-4.16.6.tgz?cache=0&sync_timestamp=1619789155823&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbrowserslist%2Fdownload%2Fbrowserslist-4.16.6.tgz",
+      "integrity": "sha1-15ASd6WojlVO0wWxg+ybDAj2b6I=",
      "requires": {
-        "caniuse-lite": "^1.0.30001165",
-        "colorette": "^1.2.1",
-        "electron-to-chromium": "^1.3.621",
+        "caniuse-lite": "^1.0.30001219",
+        "colorette": "^1.2.2",
+        "electron-to-chromium": "^1.3.723",
        "escalade": "^3.1.1",
-        "node-releases": "^1.1.67"
+        "node-releases": "^1.1.71"
      }
    },
    "camel-case": {
@ -1764,9 +1765,9 @@
      }
    },
    "caniuse-lite": {
-      "version": "1.0.30001170",
-      "resolved": "https://registry.npm.taobao.org/caniuse-lite/download/caniuse-lite-1.0.30001170.tgz?cache=0&sync_timestamp=1608444166670&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcaniuse-lite%2Fdownload%2Fcaniuse-lite-1.0.30001170.tgz",
-      "integrity": "sha1-AIi/7MahRpSWnjkcwp1+tjYspqc="
+      "version": "1.0.30001231",
+      "resolved": "https://registry.nlark.com/caniuse-lite/download/caniuse-lite-1.0.30001231.tgz?cache=0&sync_timestamp=1622442631485&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcaniuse-lite%2Fdownload%2Fcaniuse-lite-1.0.30001231.tgz",
+      "integrity": "sha1-bB+bSfwnzDaLiU5kubKLOe+AYDs="
    },
    "cheerio": {
      "version": "1.0.0-rc.3",
@ -1797,9 +1798,9 @@
      }
    },
    "colorette": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npm.taobao.org/colorette/download/colorette-1.2.1.tgz?cache=0&sync_timestamp=1593955937807&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcolorette%2Fdownload%2Fcolorette-1.2.1.tgz",
-      "integrity": "sha1-TQuSEyXBT6+SYzCGpTbbbolWSxs="
+      "version": "1.2.2",
+      "resolved": "https://registry.npm.taobao.org/colorette/download/colorette-1.2.2.tgz?cache=0&sync_timestamp=1614259623635&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcolorette%2Fdownload%2Fcolorette-1.2.2.tgz",
+      "integrity": "sha1-y8x51emcrqLb8Q6zom/Ys+as+pQ="
    },
    "commander": {
      "version": "2.20.3",
@ -1884,9 +1885,9 @@
      }
    },
    "electron-to-chromium": {
-      "version": "1.3.633",
-      "resolved": "https://registry.npm.taobao.org/electron-to-chromium/download/electron-to-chromium-1.3.633.tgz?cache=0&sync_timestamp=1608750797791&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron-to-chromium%2Fdownload%2Felectron-to-chromium-1.3.633.tgz",
-      "integrity": "sha1-Ft1a7J3gOJTo0UodtM2oo2m5t/4="
+      "version": "1.3.742",
+      "resolved": "https://registry.nlark.com/electron-to-chromium/download/electron-to-chromium-1.3.742.tgz?cache=0&sync_timestamp=1622239519943&other_urls=https%3A%2F%2Fregistry.nlark.com%2Felectron-to-chromium%2Fdownload%2Felectron-to-chromium-1.3.742.tgz",
+      "integrity": "sha1-ciMhWsu9OlKEli68tt+F2IuV8gA="
    },
    "entities": {
      "version": "1.1.2",
@ -2813,9 +2814,9 @@
      "integrity": "sha1-BFvTI2Mfdu0uK1VXM5RBa2OaAFI="
    },
    "node-releases": {
-      "version": "1.1.67",
-      "resolved": "https://registry.npm.taobao.org/node-releases/download/node-releases-1.1.67.tgz?cache=0&sync_timestamp=1605581679207&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnode-releases%2Fdownload%2Fnode-releases-1.1.67.tgz",
-      "integrity": "sha1-KOv8zNC6pqrY6NTY/ky8Sa4jnBI="
+      "version": "1.1.72",
+      "resolved": "https://registry.nlark.com/node-releases/download/node-releases-1.1.72.tgz?cache=0&sync_timestamp=1620978623877&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnode-releases%2Fdownload%2Fnode-releases-1.1.72.tgz",
+      "integrity": "sha1-FIAqtrEDmnmgx9ZithClu9durL4="
    },
    "normalize-path": {
      "version": "3.0.0",
--- a/package.json
+++ b/package.json
@ -20,6 +20,7 @@
    "@ts-stack/markdown": "^1.3.0",
    "@types/node": "^15.0.1",
    "a17t": "^0.4.0",
+    "browserslist": "^4.16.6",
    "esbuild": "^0.8.57",
    "lodash": "^4.17.21",
    "mjml": "^4.8.0",
Author	SHA1	Message	Date
Harvey Tindall	555d5abf59	bump browserslist version	2021-05-31 18:53:21 +01:00
Harvey Tindall	93937ec3b5	drone: use pre-made image with dependencies a cron job builds hrfee/jfa-go-build-docker daily, which includes the apt dependencies for building.	2021-05-31 14:58:20 +01:00
Harvey Tindall	93c7a6e31b	apt: Change versioning to hopefully fix updates 0.0.0-{commit} didn't register as updates to the previously installed versions, but it looks like 0{commit} works.	2021-05-31 14:13:41 +01:00