Skip to contentSkip to conversation

CI: Fix variable use in build-userspace action.

PATCH In review Chris PeBenito 2 participants 5 messages Jun 10 – Jun 12 SELinux security module

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 CI: Fix variable use in build-userspace action.

The code was incorrectly using the matrix variable, which isn't available in other repos. The matrix variable use accideentally worked in this repo because the action runs in the calling workflow's context, not a separate context.

---
 .github/actions/build-userspace/action.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
.github/actions/build-userspace/action.yml +8 -8
index bad6e33d..f5d21b7c 100644
@@ -71,27 +71,27 @@ runs:
         echo "RUBY=ruby" >> $GITHUB_ENV
         echo "DESTDIR=$DESTDIR" >> $GITHUB_ENV
 
-        CC=${{ matrix.compiler }}
-        if [ "${{ matrix.python-ruby-version.other }}" = "linker-bfd" ] ; then
+        CC=${{ inputs.compiler }}
+        if [ "${{ inputs.other }}" = "linker-bfd" ] ; then
             CC="$CC -fuse-ld=bfd"
-        elif [ "${{ matrix.python-ruby-version.other }}" = "linker-gold" ] ; then
+        elif [ "${{ inputs.other }}" = "linker-gold" ] ; then
             CC="$CC -fuse-ld=gold"
         fi
         # https://bugs.ruby-lang.org/issues/18616
         # https://github.com/llvm/llvm-project/issues/49958
-        if [ "${{ matrix.compiler }}" = "clang" ] && [[ "${{ matrix.python-ruby-version.ruby }}" = 3* ]] ; then
+        if [ "${{ inputs.compiler }}" = "clang" ] && [[ "${{ inputs.ruby-version }}" = 3* ]] ; then
             CC="$CC -fdeclspec"
         fi
         echo "CC=$CC" >> $GITHUB_ENV
 
         EXPLICIT_MAKE_VARS=
-        if [ "${{ matrix.python-ruby-version.other }}" = "test-flags-override" ] ; then
+        if [ "${{ inputs.other }}" = "test-flags-override" ] ; then
             # Test that overriding CFLAGS, LDFLAGS and other variables works fine
             EXPLICIT_MAKE_VARS="CFLAGS=-I$DESTDIR/usr/include LDFLAGS=-L$DESTDIR/usr/lib LDLIBS= CPPFLAGS="
-        elif [ "${{ matrix.python-ruby-version.other }}" = "test-debug" ] ; then
+        elif [ "${{ inputs.other }}" = "test-debug" ] ; then
             # Test hat debug build works fine
             EXPLICIT_MAKE_VARS="DEBUG=1"
-        elif [ "${{ matrix.python-ruby-version.other }}" = "sanitizers" ] ; then
+        elif [ "${{ inputs.other }}" = "sanitizers" ] ; then
             sanitizers='-fsanitize=address,undefined'
             EXPLICIT_MAKE_VARS="CFLAGS='-g -I$DESTDIR/usr/include $sanitizers' LDFLAGS='-L$DESTDIR/usr/lib $sanitizers' LDLIBS= CPPFLAGS= OPT_SUBDIRS="
             echo "ASAN_OPTIONS=strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1" >> $GITHUB_ENV
@@ -110,7 +110,7 @@ runs:
         PYTHON_SYS_PREFIX="$(python -c 'import sys;print(sys.prefix)')"
         echo "PKG_CONFIG_PATH=${PYTHON_SYS_PREFIX}/lib/pkgconfig" >> $GITHUB_ENV
 
-        if [[ "${{ matrix.python-ruby-version.python }}" == pypy* ]] ; then
+        if [[ "${{ inputs.python-version }}" == pypy* ]] ; then
             # PyPy does not provide a config file for pkg-config
             # libpypy-c.so is provided in bin/libpypy-c.so for PyPy and bin/libpypy3-c.so for PyPy3
             echo "PYINC=-I${PYTHON_SYS_PREFIX}/include" >> $GITHUB_ENV
Signature · 1 line
2.54.0
#1 lore raw

PATCH 2/2 CI: Add explicit output variable for build-userspace action.

Downstream users won't have to rely on DESTDIR being set in the environment.

---
 .github/actions/build-userspace/action.yml | 7 +++++++
 1 file changed, 7 insertions(+)
.github/actions/build-userspace/action.yml +7 -0
index f5d21b7c..03f9e0a2 100644
@@ -16,6 +16,11 @@ inputs:
     required: false
     default: ''
 
+outputs:
+  DESTDIR:
+    description: The destination directory for the build
+    value: ${{ steps.config-env.outputs.DESTDIR }}
+
 runs:
   using: composite
   steps:
@@ -64,12 +69,14 @@ runs:
 
     - name: Configure the environment
       shell: bash
+      id: config-env
       run: |
         echo "::group::Configure the environment"
         DESTDIR=/tmp/destdir
         echo "PYTHON=python" >> $GITHUB_ENV
         echo "RUBY=ruby" >> $GITHUB_ENV
         echo "DESTDIR=$DESTDIR" >> $GITHUB_ENV
+        echo "DESTDIR=$DESTDIR" >> $GITHUB_OUTPUT
 
         CC=${{ inputs.compiler }}
         if [ "${{ inputs.other }}" = "linker-bfd" ] ; then
Signature · 1 line
2.54.0
maintainer Acked-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] CI: Add explicit output variable for build-userspace action.

Quoted 4 lines · Chris PeBenito

Downstream users won't have to rely on DESTDIR being set in the environment.

Quoted 39 lines
---
 .github/actions/build-userspace/action.yml | 7 +++++++
 1 file changed, 7 insertions(+)
.github/actions/build-userspace/action.yml +7 -1
index f5d21b7c..03f9e0a2 100644
@@ -16,6 +16,11 @@ inputs:
     required: false
     default: ''
 
+outputs:
+  DESTDIR:
+    description: The destination directory for the build
+    value: ${{ steps.config-env.outputs.DESTDIR }}
+
 runs:
   using: composite
   steps:
@@ -64,12 +69,14 @@ runs:
 
     - name: Configure the environment
       shell: bash
+      id: config-env
       run: |
         echo "::group::Configure the environment"
         DESTDIR=/tmp/destdir
         echo "PYTHON=python" >> $GITHUB_ENV
         echo "RUBY=ruby" >> $GITHUB_ENV
         echo "DESTDIR=$DESTDIR" >> $GITHUB_ENV
+        echo "DESTDIR=$DESTDIR" >> $GITHUB_OUTPUT
 
         CC=${{ inputs.compiler }}
         if [ "${{ inputs.other }}" = "linker-bfd" ] ; then
--

2.54.0

maintainer Acked-by on v1 1/2
#4 lore raw
In reply to Chris PeBenito
Quoted 7 lines · Chris PeBenito

The code was incorrectly using the matrix variable, which isn't available in other repos. The matrix variable use accideentally worked in this repo because the action runs in the calling workflow's context, not a separate context.

Quoted 56 lines
---
 .github/actions/build-userspace/action.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
.github/actions/build-userspace/action.yml +8 -9
index bad6e33d..f5d21b7c 100644
@@ -71,27 +71,27 @@ runs:
         echo "RUBY=ruby" >> $GITHUB_ENV
         echo "DESTDIR=$DESTDIR" >> $GITHUB_ENV
 
-        CC=${{ matrix.compiler }}
-        if [ "${{ matrix.python-ruby-version.other }}" = "linker-bfd" ] ; then
+        CC=${{ inputs.compiler }}
+        if [ "${{ inputs.other }}" = "linker-bfd" ] ; then
             CC="$CC -fuse-ld=bfd"
-        elif [ "${{ matrix.python-ruby-version.other }}" = "linker-gold" ] ; then
+        elif [ "${{ inputs.other }}" = "linker-gold" ] ; then
             CC="$CC -fuse-ld=gold"
         fi
         # https://bugs.ruby-lang.org/issues/18616
         # https://github.com/llvm/llvm-project/issues/49958
-        if [ "${{ matrix.compiler }}" = "clang" ] && [[ "${{ matrix.python-ruby-version.ruby }}" = 3* ]] ; then
+        if [ "${{ inputs.compiler }}" = "clang" ] && [[ "${{ inputs.ruby-version }}" = 3* ]] ; then
             CC="$CC -fdeclspec"
         fi
         echo "CC=$CC" >> $GITHUB_ENV
 
         EXPLICIT_MAKE_VARS=
-        if [ "${{ matrix.python-ruby-version.other }}" = "test-flags-override" ] ; then
+        if [ "${{ inputs.other }}" = "test-flags-override" ] ; then
             # Test that overriding CFLAGS, LDFLAGS and other variables works fine
             EXPLICIT_MAKE_VARS="CFLAGS=-I$DESTDIR/usr/include LDFLAGS=-L$DESTDIR/usr/lib LDLIBS= CPPFLAGS="
-        elif [ "${{ matrix.python-ruby-version.other }}" = "test-debug" ] ; then
+        elif [ "${{ inputs.other }}" = "test-debug" ] ; then
             # Test hat debug build works fine
             EXPLICIT_MAKE_VARS="DEBUG=1"
-        elif [ "${{ matrix.python-ruby-version.other }}" = "sanitizers" ] ; then
+        elif [ "${{ inputs.other }}" = "sanitizers" ] ; then
             sanitizers='-fsanitize=address,undefined'
             EXPLICIT_MAKE_VARS="CFLAGS='-g -I$DESTDIR/usr/include $sanitizers' LDFLAGS='-L$DESTDIR/usr/lib $sanitizers' LDLIBS= CPPFLAGS= OPT_SUBDIRS="
             echo "ASAN_OPTIONS=strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1" >> $GITHUB_ENV
@@ -110,7 +110,7 @@ runs:
         PYTHON_SYS_PREFIX="$(python -c 'import sys;print(sys.prefix)')"
         echo "PKG_CONFIG_PATH=${PYTHON_SYS_PREFIX}/lib/pkgconfig" >> $GITHUB_ENV
 
-        if [[ "${{ matrix.python-ruby-version.python }}" == pypy* ]] ; then
+        if [[ "${{ inputs.python-version }}" == pypy* ]] ; then
             # PyPy does not provide a config file for pkg-config
             # libpypy-c.so is provided in bin/libpypy-c.so for PyPy and bin/libpypy3-c.so for PyPy3
             echo "PYINC=-I${PYTHON_SYS_PREFIX}/include" >> $GITHUB_ENV
--

2.54.0