github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #8868 from AkihiroSuda/epoch-y2038

Browse Source 
pkg/epoch: fix Y2038 on 32-bit hosts
This commit is contained in:
Fu Wei 2023-07-26 13:43:53 +08:00 committed by GitHub
commit bdbcf96267
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/epoch/epoch.go
View File

@ -73,7 +73,7 @@ func ParseSourceDateEpoch(sourceDateEpoch string) (*time.Time, error) {
// SetSourceDateEpoch sets the SOURCE_DATE_EPOCH env var. // SetSourceDateEpoch sets the SOURCE_DATE_EPOCH env var.
func SetSourceDateEpoch(tm time.Time) { func SetSourceDateEpoch(tm time.Time) {
_ = os.Setenv(SourceDateEpochEnv, strconv.Itoa(int(tm.Unix()))) _ = os.Setenv(SourceDateEpochEnv, fmt.Sprintf("%d", tm.Unix()))
} }
// UnsetSourceDateEpoch unsets the SOURCE_DATE_EPOCH env var. // UnsetSourceDateEpoch unsets the SOURCE_DATE_EPOCH env var.

4
pkg/epoch/epoch_test.go
View File

@ -17,9 +17,9 @@
package epoch package epoch
import ( import (
"fmt"
"os" "os"
"runtime" "runtime"
"strconv"
"testing" "testing"
"time" "time"
@ -85,7 +85,7 @@ func TestSourceDateEpoch(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
require.True(t, vp.Equal(sourceDateEpoch.UTC())) require.True(t, vp.Equal(sourceDateEpoch.UTC()))
vp, err = ParseSourceDateEpoch(strconv.Itoa(int(sourceDateEpoch.Unix()))) vp, err = ParseSourceDateEpoch(fmt.Sprintf("%d", sourceDateEpoch.Unix()))
require.NoError(t, err) require.NoError(t, err)
require.True(t, vp.Equal(sourceDateEpoch)) require.True(t, vp.Equal(sourceDateEpoch))