Skip to content

Commit

Permalink
Merge pull request #49 from hashicorp/TF-10898-go-slug-0-13-1-wont-co…
Browse files Browse the repository at this point in the history
…mpile-on-linux-386-platforms

Fixes linux 32bit build issue on v0.13.1
  • Loading branch information
brandonc authored Nov 10, 2023
2 parents eb823de + 1bb0682 commit ffdd023
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 4 deletions.
23 changes: 23 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,29 @@ name: test
on: [push]

jobs:
build:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
goos: [linux, windows, darwin]
goarch: ["386", amd64, arm64]
exclude:
- goarch: "386"
goos: darwin
- goarch: arm64
goos: windows
steps:
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0

- name: setup go
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
with:
go-version-file: go.mod

- name: build
run: GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }} go build

unit-test:
runs-on: ubuntu-latest
steps:
Expand Down
28 changes: 28 additions & 0 deletions internal/unpackinfo/lchtimes_linux32.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
//go:build linux_amd || linux_arm
// +build linux_amd linux_arm

package unpackinfo

import (
"golang.org/x/sys/unix"
)

// Lchtimes modifies the access and modified timestamps on a target path
// This capability is only available on Linux and Darwin as of now.
func (i UnpackInfo) Lchtimes() error {
return unix.Lutimes(i.Path, []unix.Timeval{
{Sec: i.OriginalAccessTime.Unix(), Usec: int32(i.OriginalAccessTime.Nanosecond() / 1e6 % 1e6)},
{Sec: i.OriginalModTime.Unix(), Usec: int32(i.OriginalModTime.Nanosecond() / 1e6 % 1e6)}},
)
}

// CanMaintainSymlinkTimestamps determines whether is is possible to change
// timestamps on symlinks for the the current platform. For regular files
// and directories, attempts are made to restore permissions and timestamps
// after extraction. But for symbolic links, go's cross-platform
// packages (Chmod and Chtimes) are not capable of changing symlink info
// because those methods follow the symlinks. However, a platform-dependent option
// is provided for linux and darwin (see Lchtimes)
func CanMaintainSymlinkTimestamps() bool {
return true
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:build linux
// +build linux
//go:build linux_amd64 || linux_arm64
// +build linux_amd64 linux_arm64

package unpackinfo

Expand Down
4 changes: 2 additions & 2 deletions internal/unpackinfo/lchtimes_others.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:build !(linux || darwin)
// +build !linux,!darwin
//go:build !darwin && !linux_amd64 && !linux_arm64 && !linux_amd && !linux_arm
// +build !darwin,!linux_amd64,!linux_arm64,!linux_amd,!linux_arm

package unpackinfo

Expand Down

0 comments on commit ffdd023

Please sign in to comment.