Skip to content

Commit a5223c5

Browse files
authored
Merge branch 'main' into multicall-gtest
2 parents 22f8fa7 + 404257d commit a5223c5

File tree

4 files changed

+17
-5
lines changed

4 files changed

+17
-5
lines changed

.github/workflows/CICD.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -582,8 +582,7 @@ jobs:
582582
- { os: ubuntu-latest , target: x86_64-unknown-linux-gnu , features: "feat_os_unix,test_risky_names", use-cross: use-cross }
583583
- { os: ubuntu-latest , target: x86_64-unknown-linux-gnu , features: "feat_os_unix,uudoc" , use-cross: no, workspace-tests: true }
584584
- { os: ubuntu-latest , target: x86_64-unknown-linux-musl , features: feat_os_unix_musl , use-cross: use-cross }
585-
# broken by network error
586-
# - { os: ubuntu-latest , target: x86_64-unknown-redox , features: feat_os_unix_redox , use-cross: redoxer , skip-tests: true }
585+
- { os: ubuntu-latest , target: x86_64-unknown-redox , features: feat_os_unix_redox , use-cross: redoxer , skip-tests: true }
587586
- { os: ubuntu-latest , target: wasm32-unknown-unknown , default-features: false, features: uucore/format, skip-tests: true, skip-package: true, skip-publish: true }
588587
- { os: macos-latest , target: aarch64-apple-darwin , features: feat_os_macos, workspace-tests: true } # M1 CPU
589588
# PR #7964: Mac should still build even if the feature is not enabled
@@ -783,7 +782,7 @@ jobs:
783782
- uses: taiki-e/install-action@v2
784783
if: steps.vars.outputs.CARGO_CMD == 'redoxer'
785784
with:
786-
785+
787786
- name: Initialize toolchain-dependent workflow variables
788787
id: dep_vars
789788
shell: bash

GNUmakefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,8 +317,6 @@ endif
317317

318318
all: build
319319

320-
use_default := 1
321-
322320
build-pkgs:
323321
ifneq (${MULTICALL}, y)
324322
ifdef BUILD_SPEC_FEATURE
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
--git a/tests/runcon/runcon-no-reorder.sh b/tests/runcon/runcon-no-reorder.sh
2+
index 2027555..956c51e 100644
3+
--- a/tests/runcon/runcon-no-reorder.sh
4+
+++ b/tests/runcon/runcon-no-reorder.sh
5+
@@ -16,6 +16,9 @@
6+
# You should have received a copy of the GNU General Public License
7+
# along with this program. If not, see <https://www.gnu.org/licenses/>.
8+
9+
+# We don't have runcon buildable without libselinux.
10+
+_require_selinux_
11+
+
12+
. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
13+
print_ver_ runcon
14+

util/gnu-patches/series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ tests_tsort.patch
1111
tests_du_move_dir_while_traversing.patch
1212
test_mkdir_restorecon.patch
1313
error_msg_uniq.diff
14+
runcon-no-reorder.patch

0 commit comments

Comments
 (0)