Merge pull request #909 from dtrudg/pick-build

dtrudg · web-flow · commit 84c30ac3c040 · 2022-07-15T12:59:33.000-05:00
Pick build changes from main to 3.10.1
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,12 +6,12 @@ orbs:
 parameters:
   go-version:
     type: string
-    default: '1.18.2'
+    default: '1.18.4'
 
 executors:
   node:
     docker:
-      - image: node:17-slim
+      - image: node:18-slim
   golang:
     parameters:
       variant:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 ### Bug Fixes
 
 - Fix test code that implied `%test -c <shell>` was supported - it is not.
+- Fix compilation on `mipsel`.
 
 ## 3.10.0 \[2022-05-17\]
 
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -76,6 +76,7 @@ The following have contributed code and/or documentation to this repository.
 - Mike Gray <mike@sylabs.io>
 - Nathan Chou <nathan.chou@sylabs.io>, <choun@berkeley.edu>
 - Nathan Lin <nathan.lin@yale.edu>
+- Nilesh Patra <nilesh@nileshpatra.info>
 - Oleksandr Moskalenko <om@rc.ufl.edu>
 - Oliver Breitwieser <obreitwi@kip.uni-heidelberg.de>, <oliver@breitwieser.eu>
 - Oliver Freyermuth <freyermuth@physik.uni-bonn.de>
diff --git a/INSTALL.md b/INSTALL.md
@@ -56,7 +56,7 @@ _**NOTE:** if you are updating Go from a older version, make sure you remove
 `/usr/local/go` before reinstalling it._
 
 ```sh
-export VERSION=1.18.2 OS=linux ARCH=amd64  # change this as you need
+export VERSION=1.18.4 OS=linux ARCH=amd64  # change this as you need
 
 wget -O /tmp/go${VERSION}.${OS}-${ARCH}.tar.gz \
   https://dl.google.com/go/go${VERSION}.${OS}-${ARCH}.tar.gz
diff --git a/cmd/internal/cli/cgroups.go b/cmd/internal/cli/cgroups.go
@@ -299,5 +299,7 @@ func deviceMajorMinor(path string) (major, minor int64, err error) {
 		return -1, -1, fmt.Errorf("%s is not a device", path)
 	}
 
-	return int64(unix.Major(stat.Rdev)), int64(unix.Minor(stat.Rdev)), nil
+	// Extra casting to uint64 for stat.Rdev to make sure correct type is set correctly on all archs
+	// and avoid failures on mips
+	return int64(unix.Major(uint64(stat.Rdev))), int64(unix.Minor(uint64(stat.Rdev))), nil
 }
diff --git a/third_party/conmon b/third_party/conmon
@@ -1 +1 @@
-Subproject commit 4c41ec2a215c502ad6c38ea255ac1082fa1d381d
+Subproject commit 2bc95ee697e87d5f7b77063cf83fc32739addafe

-Original file line number
+Diff line change
 - Mike Gray <[email protected]>
 - Nathan Chou <[email protected]>, <[email protected]>
 - Nathan Lin <[email protected]>
 +- Nilesh Patra <[email protected]>
 - Oleksandr Moskalenko <[email protected]>
 - Oliver Breitwieser <[email protected]>, <[email protected]>
 - Oliver Freyermuth <[email protected]>
Original file line number	Diff line number	Diff line change
`@@ -299,5 +299,7 @@ func deviceMajorMinor(path string) (major, minor int64, err error) {`
`299`	`299`	`return -1, -1, fmt.Errorf("%s is not a device", path)`
`300`	`300`	`}`
`301`	`301`
`302`		`- return int64(unix.Major(stat.Rdev)), int64(unix.Minor(stat.Rdev)), nil`
	`302`	`+ // Extra casting to uint64 for stat.Rdev to make sure correct type is set correctly on all archs`
	`303`	`+ // and avoid failures on mips`
	`304`	`+ return int64(unix.Major(uint64(stat.Rdev))), int64(unix.Minor(uint64(stat.Rdev))), nil`
`303`	`305`	`}`