From a5d4242764ea96f44bb289902e6be90026b8717b Mon Sep 17 00:00:00 2001 From: Thorsten de Buhr Date: Mon, 5 Jun 2023 15:47:08 +0200 Subject: [PATCH] [cpackget] MacOS tests failing #150 (#177) Clearing RO flag before renaming of files / folders. Required on MAC to run on RO-directories --- .github/workflows/test.yml | 6 +++--- cmd/utils/utils.go | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e0b37af..3041d18 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -98,14 +98,14 @@ jobs: strategy: matrix: # Tests on Mac are currently broken - goos: [windows, linux] # , darwin] + goos: [windows, linux, darwin] include: - goos: windows runs-on: windows-latest - goos: linux runs-on: ubuntu-latest -# - goos: darwin -# runs-on: macos-latest + - goos: darwin + runs-on: macos-latest name: "${{ matrix.goos }} | amd64" runs-on: ${{ matrix.runs-on }} diff --git a/cmd/utils/utils.go b/cmd/utils/utils.go index decdd1f..597020e 100644 --- a/cmd/utils/utils.go +++ b/cmd/utils/utils.go @@ -219,6 +219,8 @@ func MoveFile(source, destination string) error { return errs.ErrCopyingEqualPaths } + UnsetReadOnly(source) + err := os.Rename(source, destination) if err != nil { log.Errorf("Can't move file \"%s\" to \"%s\": %s", source, destination, err)