RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

Merge pull request #5606 from piotrkwiecinski/freebsd-vm

Browse source 
Bump freebsd-vm action to v1.0.2 & use ubuntu
This commit is contained in:
Daniel Hofstetter 2023-12-01 07:07:38 +01:00 • committed by GitHub
commit 319315c019
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
.github/workflows/freebsd.yml vendored
View file

@ -25,7 +25,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
job: job:
- { os: macos-12 , features: unix } ## GHA MacOS-11.0 VM won't have VirtualBox; refs: <https://github.com/actions/virtual-environments/issues/4060> , <https://github.com/actions/virtual-environments/pull/4010> - { os: ubuntu-22.04 , features: unix }
env: env:
SCCACHE_GHA_ENABLED: "true" SCCACHE_GHA_ENABLED: "true"
RUSTC_WRAPPER: "sccache" RUSTC_WRAPPER: "sccache"
@ -35,9 +35,11 @@ jobs:
- name: Run sccache-cache - name: Run sccache-cache
uses: mozilla-actions/sccache-action@v0.0.3 uses: mozilla-actions/sccache-action@v0.0.3
- name: Prepare, build and test - name: Prepare, build and test
uses: vmactions/freebsd-vm@v0.3.1 uses: vmactions/freebsd-vm@v1.0.2
with: with:
usesh: true usesh: true
sync: rsync
copyback: false
# We need jq to run show-utils.sh and bash to use inline shell string replacement # We need jq to run show-utils.sh and bash to use inline shell string replacement
prepare: pkg install -y curl sudo jq bash prepare: pkg install -y curl sudo jq bash
run: | run: |
@ -48,11 +50,11 @@ jobs:
# #
TEST_USER=tester TEST_USER=tester
REPO_NAME=${GITHUB_WORKSPACE##*/} REPO_NAME=${GITHUB_WORKSPACE##*/}
WORKSPACE_PARENT="/Users/runner/work/${REPO_NAME}" WORKSPACE_PARENT="/home/runner/work/${REPO_NAME}"
WORKSPACE="${WORKSPACE_PARENT}/${REPO_NAME}" WORKSPACE="${WORKSPACE_PARENT}/${REPO_NAME}"
# #
pw adduser -n ${TEST_USER} -d /root/ -g wheel -c "Coreutils user to build" -w random pw adduser -n ${TEST_USER} -d /root/ -g wheel -c "Coreutils user to build" -w random
chown -R ${TEST_USER}:wheel /root/ "/Users/runner/work/${REPO_NAME}"/ chown -R ${TEST_USER}:wheel /root/ "${WORKSPACE_PARENT}"/
whoami whoami
# #
# Further work needs to be done in a sudo as we are changing users # Further work needs to be done in a sudo as we are changing users
@ -114,7 +116,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
job: job:
- { os: macos-12 , features: unix } ## GHA MacOS-11.0 VM won't have VirtualBox; refs: <https://github.com/actions/virtual-environments/issues/4060> , <https://github.com/actions/virtual-environments/pull/4010> - { os: ubuntu-22.04 , features: unix }
env: env:
mem: 4096 mem: 4096
SCCACHE_GHA_ENABLED: "true" SCCACHE_GHA_ENABLED: "true"
@ -125,10 +127,11 @@ jobs:
- name: Run sccache-cache - name: Run sccache-cache
uses: mozilla-actions/sccache-action@v0.0.3 uses: mozilla-actions/sccache-action@v0.0.3
- name: Prepare, build and test - name: Prepare, build and test
uses: vmactions/freebsd-vm@v0.3.1 uses: vmactions/freebsd-vm@v1.0.2
with: with:
usesh: true usesh: true
# sync: sshfs sync: rsync
copyback: false
prepare: pkg install -y curl gmake sudo prepare: pkg install -y curl gmake sudo
run: | run: |
## Prepare, build, and test ## Prepare, build, and test
@ -141,12 +144,12 @@ jobs:
# #
TEST_USER=tester TEST_USER=tester
REPO_NAME=${GITHUB_WORKSPACE##*/} REPO_NAME=${GITHUB_WORKSPACE##*/}
WORKSPACE_PARENT="/Users/runner/work/${REPO_NAME}" WORKSPACE_PARENT="/home/runner/work/${REPO_NAME}"
WORKSPACE="${WORKSPACE_PARENT}/${REPO_NAME}" WORKSPACE="${WORKSPACE_PARENT}/${REPO_NAME}"
# #
pw adduser -n ${TEST_USER} -d /root/ -g wheel -c "Coreutils user to build" -w random pw adduser -n ${TEST_USER} -d /root/ -g wheel -c "Coreutils user to build" -w random
# chown -R ${TEST_USER}:wheel /root/ "${WORKSPACE_PARENT}"/ # chown -R ${TEST_USER}:wheel /root/ "${WORKSPACE_PARENT}"/
chown -R ${TEST_USER}:wheel /root/ "/Users/runner/work/${REPO_NAME}"/ chown -R ${TEST_USER}:wheel /root/ "${WORKSPACE_PARENT}"/
whoami whoami
# #
# Further work needs to be done in a sudo as we are changing users # Further work needs to be done in a sudo as we are changing users

2
tests/by-util/test_cp.rs
View file

@ -257,6 +257,8 @@ fn test_cp_target_directory_is_file() {
} }
#[test] #[test]
// FixMe: for FreeBSD, flaky test; track repair progress at GH:uutils/coreutils/issue/4725
#[cfg(not(target_os = "freebsd"))]
fn test_cp_arg_update_interactive() { fn test_cp_arg_update_interactive() {
new_ucmd!() new_ucmd!()
.arg(TEST_HELLO_WORLD_SOURCE) .arg(TEST_HELLO_WORLD_SOURCE)