Skip to content

Commit

Permalink
Merge pull request #12 from MikeMoore63/feat/upgradego
Browse files Browse the repository at this point in the history
feat: upate go as go 1.21 is eol
  • Loading branch information
MikeMoore63 authored Sep 7, 2024
2 parents 5f0a20c + 067e316 commit b54d5d0
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module pyrustaudit

go 1.21
go 1.22

require github.com/microsoft/go-rustaudit v0.0.0-20240820110456-0e2abec02f8b
2 changes: 1 addition & 1 deletion installGo.ps1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Install the current Go release
param(
[string]$w='c:\go',
[string]$v='1.21.12'
[string]$v='1.22.7'
)
Set-ExecutionPolicy -ExecutionPolicy Bypass -Scope CurrentUser
$OutputVariable = (go version) | Out-String
Expand Down
13 changes: 7 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,13 @@ switch_eol_centos_repos()
switch_eol_centos_repos
if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ] && [ "${AUDITWHEEL_ARCH}" == "x86_64" ]
then
yum install -y golang
mkdir -p /usr/local
curl https://dl.google.com/go/go1.22.7.linux-amd64.tar.gz | tar -C /usr/local -xzf -
fi
if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ] && [ "${AUDITWHEEL_ARCH}" == "aarch64" ]
then
mkdir -p /usr/local
curl https://dl.google.com/go/go1.21.12.linux-arm64.tar.gz | tar -C /usr/local -xzf -
curl https://dl.google.com/go/go1.22.7.linux-arm64.tar.gz | tar -C /usr/local -xzf -
fi
'''
environment = """
Expand All @@ -43,20 +44,20 @@ PATH=$PATH:/usr/local/go/bin

[tool.cibuildwheel.macos]
before-all = '''
brew install go@1.21
brew install go@1.22
'''
environment = "PATH=/usr/local/opt/go@1.21/bin:/opt/homebrew/opt/go@1.21/bin:$PATH"
environment = "PATH=/usr/local/opt/go@1.22/bin:/opt/homebrew/opt/go@1.22/bin:$PATH"

[[tool.cibuildwheel.overrides]]
select = "*-musllinux*"
before-all = '''
if [ "${AUDITWHEEL_ARCH}" == "x86_64" ]
then
wget https://golang.org/dl/go1.21.12.linux-amd64.tar.gz;tar -C /usr/local -xzf go1.21.12.linux-amd64.tar.gz
wget https://golang.org/dl/go1.22.7.linux-amd64.tar.gz;tar -C /usr/local -xzf go1.22.7.linux-amd64.tar.gz
fi
if [ "${AUDITWHEEL_ARCH}" == "aarch64" ]
then
wget https://golang.org/dl/go1.21.12.linux-arm64.tar.gz;tar -C /usr/local -xzf go1.21.12.linux-arm64.tar.gz
wget https://golang.org/dl/go1.22.7.linux-arm64.tar.gz;tar -C /usr/local -xzf go1.22.7.linux-arm64.tar.gz
fi
'''

Expand Down

0 comments on commit b54d5d0

Please sign in to comment.