Merge pull request #1153 from tianon/arches

LaurentGoderre · web-flow · commit 57911b4e2ae2 · 2019-11-18T10:41:02.000-05:00
Fix architectures lists for consistency and correctness
diff --git a/.travis.yml b/.travis.yml
@@ -303,6 +303,13 @@ jobs:
         - NODE_VERSION="8"
         - VARIANT="alpine3.10"
 
+    - stage: Build
+      before_script: *auto_skip
+      name: 8 on onbuild
+      env:
+        - NODE_VERSION="8"
+        - VARIANT="onbuild"
+
     - stage: Build
       before_script: *auto_skip
       name: chakracore/10 on default
diff --git a/13/architectures b/13/architectures
@@ -1,8 +1,8 @@
 bashbrew-arch   variants
-amd64    alpine,stretch,stretch-slim,buster,buster-slim
-arm32v6  alpine
-arm32v7  alpine,stretch,stretch-slim,buster,buster-slim
-arm64v8  alpine,stretch,stretch-slim,buster,buster-slim
-i386     alpine
-ppc64le  alpine,stretch,stretch-slim,buster,buster-slim
-s390x    alpine,stretch,stretch-slim,buster,buster-slim
+amd64    stretch,stretch-slim,buster,buster-slim,alpine3.10
+arm32v6  alpine3.10
+arm32v7  stretch,stretch-slim,buster,buster-slim,alpine3.10
+arm64v8  stretch,stretch-slim,buster,buster-slim,alpine3.10
+i386     alpine3.10
+ppc64le  stretch,stretch-slim,buster,buster-slim,alpine3.10
+s390x    stretch,stretch-slim,buster,buster-slim,alpine3.10
diff --git a/8/architectures b/8/architectures
@@ -3,6 +3,6 @@ amd64    jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,al
 arm32v6  alpine3.9,alpine3.10
 arm32v7  jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild
 arm64v8  stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild
-i386     jessie,jessie-slim,alpine,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild
+i386     jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild
 ppc64le  stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild
 s390x    stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild
diff --git a/architectures b/architectures
@@ -1,8 +1,8 @@
 bashbrew-arch   variants
-amd64    jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10
-arm32v6  jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10
-arm32v7  jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10
-arm64v8  jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10
-i386     jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10
-ppc64le  jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10
-s390x    jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10
+amd64    jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild
+arm32v6  jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild
+arm32v7  jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild
+arm64v8  jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild
+i386     jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild
+ppc64le  jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild
+s390x    jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild
