Skip to content

Commit

Permalink
Fix temp folder handling on windows
Browse files Browse the repository at this point in the history
Something with the globing seems not work but not sure exactly. Now using a simple way of ensure that the target folder never exists when calling `mv` so that it behaves as a rename instead of a move into. The folder still needs to be created first so that parent folders (in case of a custom cache path) are created.
  • Loading branch information
kuhnroyal committed Feb 4, 2022
1 parent 05b7251 commit b3c14e7
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 6 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/workflow.yml
@@ -1,5 +1,12 @@
name: Main workflow
on: [push, pull_request]
on:
push:
branches:
- main
pull_request:
branches:
- main

jobs:
test_channel:
runs-on: ${{ matrix.operating-system }}
Expand Down
14 changes: 9 additions & 5 deletions setup.sh
Expand Up @@ -52,11 +52,17 @@ download_archive() {

curl --connect-timeout 15 --retry 5 $archive_url >$archive_local

# Create the target folder
mkdir -p "$2"

if [[ $archive_name == *zip ]]; then
unzip -q -o "$archive_local" -d "$RUNNER_TEMP"
shopt -s dotglob
mv ${RUNNER_TEMP}/flutter/* "$2"
shopt -u dotglob
# Remove the folder again so that the move command can do a simple rename
# instead of moving the content into the target folder.
# This is a little bit of a hack since the "mv --no-target-directory"
# linux option is not available here
rm -r "$2"
mv ${RUNNER_TEMP}/flutter "$2"
else
tar xf "$archive_local" -C "$2" --strip-components=1
fi
Expand Down Expand Up @@ -90,8 +96,6 @@ else
PUB_CACHE="${HOME}/.pub-cache"
fi

mkdir -p "$SDK_CACHE"

if [[ ! -x "${SDK_CACHE}/bin/flutter" ]]; then
if [[ $CHANNEL == master ]]; then
git clone -b master https://github.com/flutter/flutter.git "$SDK_CACHE"
Expand Down

0 comments on commit b3c14e7

Please sign in to comment.