Merge pull request #22 from parca-dev/add_pseudo_versions

python: Add pseudo versions
parca-dev · Feb 19, 2024 · 7a16761 · 7a16761
2 parents eb8bca1 + bf9fe6b
commit 7a16761
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 10 deletions.
diff --git a/.github/workflows/generate-python.yml b/.github/workflows/generate-python.yml
@@ -21,8 +21,8 @@ jobs:
       matrix:
         python-version: [
           2.7.8, 2.7.9, 2.7.10, 2.7.11, 2.7.12, 2.7.13, 2.7.14, 2.7.15, 2.7.16, 2.7.17, 2.7.18,
-          3.3.6, 3.3.7,
-          3.4.2, 3.4.3, 3.4.4, 3.4.5, 3.4.6, 3.4.7, 3.4.8, 3.4.9, 3.4.10,
+          3.3, 3.3.6, 3.3.7,
+          3.4, 3.4.2, 3.4.3, 3.4.4, 3.4.5, 3.4.6, 3.4.7, 3.4.8, 3.4.9, 3.4.10,
           3.5.0, 3.5.1, 3.5.2, 3.5.3, 3.5.4, 3.5.5, 3.5.6, 3.5.7, 3.5.8, 3.5.9, 3.5.10,
           3.6.0, 3.6.1, 3.6.2, 3.6.3, 3.6.4, 3.6.5, 3.6.6, 3.6.7, 3.6.8, 3.6.9, 3.6.10, 3.6.11, 3.6.12, 3.6.13, 3.6.14, 3.6.15,
           3.7.0, 3.7.1, 3.7.2, 3.7.3, 3.7.4, 3.7.5, 3.7.6, 3.7.7, 3.7.8, 3.7.9, 3.7.10, 3.7.11, 3.7.12, 3.7.13, 3.7.14, 3.7.15, 3.7.16, 3.7.17,

diff --git a/cmd/structlayout/structlayout.go b/cmd/structlayout/structlayout.go
@@ -41,7 +41,7 @@ func main() {
 
 	fSet.Usage = func() {
 		fmt.Printf("usage: structlayout [flags] <path-to-elf>\n")
-		fmt.Printf("e.g: structlayout -m python -v 3.9.5 /usr/bin/python3.9\n\n")
+		fmt.Printf("e.g: structlayout -r python -v 3.9.5 /usr/bin/python3.9\n\n")
 		fmt.Println("flags:")
 		fSet.PrintDefaults()
 	}

diff --git a/scripts/download/python.sh b/scripts/download/python.sh
@@ -20,7 +20,7 @@ set -euo pipefail
 
 CONTAINER_RUNTIME=${CONTAINER_RUNTIME:-docker}
 TARGET_DIR=${TARGET_DIR:-tests/integration/binaries/python}
-ARCH=${ARCH}
+ARCH=${ARCH:-""}
 
 # https://devguide.python.org/versions/
 python_versions=(

diff --git a/scripts/download/ruby.sh b/scripts/download/ruby.sh
@@ -20,7 +20,7 @@ set -euo pipefail
 
 CONTAINER_RUNTIME=${CONTAINER_RUNTIME:-docker}
 TARGET_DIR=${TARGET_DIR:-tests/integration/binaries/ruby}
-ARCH=${ARCH}
+ARCH=${ARCH:-""}
 
 ruby_versions=(
     2.6.0

diff --git a/scripts/mergelayout/python.sh b/scripts/mergelayout/python.sh
@@ -18,7 +18,7 @@ set -euo pipefail
 
 # This script helps to merge structlayout outputs in specified directory for integration tests.
 
-ARCH=${ARCH}
+ARCH=${ARCH:-""}
 target_archs=(
     amd64
     arm64

diff --git a/scripts/mergelayout/ruby.sh b/scripts/mergelayout/ruby.sh
@@ -18,7 +18,7 @@ set -euo pipefail
 
 # This script helps to merge structlayout outputs in specified directory for integration tests.
 
-ARCH=${ARCH}
+ARCH=${ARCH:-""}
 target_archs=(
     amd64
     arm64

diff --git a/scripts/structlayout/python.sh b/scripts/structlayout/python.sh
@@ -39,7 +39,7 @@ python_versions=(
     3.11.0 # bugfix
 )
 
-ARCH=${ARCH}
+ARCH=${ARCH:-""}
 target_archs=(
     amd64
     arm64

diff --git a/scripts/structlayout/ruby.sh b/scripts/structlayout/ruby.sh
@@ -32,7 +32,7 @@ ruby_versions=(
     3.2.1
 )
 
-ARCH=${ARCH}
+ARCH=${ARCH:-""}
 target_archs=(
     amd64
     arm64
@@ -41,7 +41,6 @@ if [ -n "${ARCH}" ]; then
     target_archs=("${ARCH}")
 fi
 
-
 mkdir -p tmp/ruby
 for ruby_version in "${ruby_versions[@]}"; do
     for arch in "${target_archs[@]}"; do