Rename workflow archs as x64 and x86

molinav · molinav · commit 2aefca290162 · 2021-12-07T11:51:51.000+01:00
diff --git a/.github/workflows/basemap.yml b/.github/workflows/basemap.yml
@@ -14,8 +14,8 @@ jobs:
       matrix:
         arch:
           [
-            "i386",
-            "amd64",
+            "x64",
+            "x86",
           ]
       max-parallel: 2
       fail-fast: false
@@ -36,8 +36,8 @@ jobs:
           pkgname=cmake
           pkgcode=cmake-${pkgvers}
           case "${{ matrix.arch }}" in
-              amd64)  pkgfile=${pkgcode}-Linux-x86_64.tar.gz;;
-              *)      pkgfile=${pkgcode}-Linux-i386.tar.gz;;
+              x86)  pkgfile=${pkgcode}-Linux-i386.tar.gz;;
+              *)    pkgfile=${pkgcode}-Linux-x86_64.tar.gz;;
           esac
           wget https://github.com/Kitware/CMake/releases/download/v${pkgvers}/${pkgfile} -P /tmp
           tar -xf /tmp/${pkgfile} --strip-components=1 -C /usr
@@ -72,8 +72,8 @@ jobs:
       matrix:
         arch:
           [
-            "i386",
-            "amd64",
+            "x64",
+            "x86",
           ]
         python-version:
           [
@@ -156,8 +156,8 @@ jobs:
       matrix:
         arch:
           [
-            "i386",
-            "amd64",
+            "x64",
+            "x86",
           ]
         python-version:
           [
@@ -258,8 +258,8 @@ jobs:
       matrix:
         arch:
           [
-            "i386",
-            "amd64",
+            "x64",
+            "x86",
           ]
         python-version:
           [

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ jobs:`
`14`	`14`	`matrix:`
`15`	`15`	`arch:`
`16`	`16`	`[`
`17`		`- "i386",`
`18`		`- "amd64",`
	`17`	`+ "x64",`
	`18`	`+ "x86",`
`19`	`19`	`]`
`20`	`20`	`max-parallel: 2`
`21`	`21`	`fail-fast: false`
`@@ -36,8 +36,8 @@ jobs:`
`36`	`36`	`pkgname=cmake`
`37`	`37`	`pkgcode=cmake-${pkgvers}`
`38`	`38`	`case "${{ matrix.arch }}" in`
`39`		`- amd64) pkgfile=${pkgcode}-Linux-x86_64.tar.gz;;`
`40`		`- *) pkgfile=${pkgcode}-Linux-i386.tar.gz;;`
	`39`	`+ x86) pkgfile=${pkgcode}-Linux-i386.tar.gz;;`
	`40`	`+ *) pkgfile=${pkgcode}-Linux-x86_64.tar.gz;;`
`41`	`41`	`esac`
`42`	`42`	`wget https://github.com/Kitware/CMake/releases/download/v${pkgvers}/${pkgfile} -P /tmp`
`43`	`43`	`tar -xf /tmp/${pkgfile} --strip-components=1 -C /usr`
`@@ -72,8 +72,8 @@ jobs:`
`72`	`72`	`matrix:`
`73`	`73`	`arch:`
`74`	`74`	`[`
`75`		`- "i386",`
`76`		`- "amd64",`
	`75`	`+ "x64",`
	`76`	`+ "x86",`
`77`	`77`	`]`
`78`	`78`	`python-version:`
`79`	`79`	`[`
`@@ -156,8 +156,8 @@ jobs:`
`156`	`156`	`matrix:`
`157`	`157`	`arch:`
`158`	`158`	`[`
`159`		`- "i386",`
`160`		`- "amd64",`
	`159`	`+ "x64",`
	`160`	`+ "x86",`
`161`	`161`	`]`
`162`	`162`	`python-version:`
`163`	`163`	`[`
`@@ -258,8 +258,8 @@ jobs:`
`258`	`258`	`matrix:`
`259`	`259`	`arch:`
`260`	`260`	`[`
`261`		`- "i386",`
`262`		`- "amd64",`
	`261`	`+ "x64",`
	`262`	`+ "x86",`
`263`	`263`	`]`
`264`	`264`	`python-version:`
`265`	`265`	`[`