Skip to content

Commit

Permalink
fix SKIP_ARCH_DETECTION logic
Browse files Browse the repository at this point in the history
Signed-off-by: Justin Kolberg <[email protected]>
  • Loading branch information
amdprophet committed Nov 6, 2024
1 parent 9fb291e commit 442f657
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/build_packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,5 @@ jobs:
env:
S3_BUCKET: sumologic-osc-ci-builds
OVERRIDE_ARCH: x64
run: |
$env:SKIP_ARCHITECTURE_DETECTION = $True
make test
SKIP_ARCH_DETECTION: 1
run: make test
12 changes: 8 additions & 4 deletions install-script/install.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,8 @@ param (

# SkipArchDetection will disable the detection of the CPU architecture.
# CPU architecture detection is slow. Using OverrideArch with this flag
# improves the overall time it takes to execute this script. The default
# value is set to the value of the SKIP_ARCHITECTURE_DETECTION environment
# variable.
[bool] $SkipArchDetection = $env:SKIP_ARCHITECTURE_DETECTION,
# improves the overall time it takes to execute this script.
[bool] $SkipArchDetection,

# S3Bucket is used to specify which S3 bucket to download the MSI package
# from. The default value is set to the value of the S3_BUCKET environment
Expand All @@ -56,6 +54,12 @@ param (
[string] $S3Region = $env:S3_REGION
)

# If the environment variable SKIP_ARCH_DETECTION is set and is not
# equal to "0" then set $SkipArchDetection to $True.
if ($env:SKIP_ARCH_DETECTION -ne "" -and $env:SKIP_ARCH_DETECTION -ne "0") {
$SkipArchDetection = $True
}

if ($S3Bucket -eq "") {
$S3Bucket = "sumologic-osc-stable"
}
Expand Down

0 comments on commit 442f657

Please sign in to comment.