Skip to content

Commit

Permalink
Merge pull request #134 from kuhnroyal/temp-folder-windows
Browse files Browse the repository at this point in the history
Fix temp folder handling on windows
  • Loading branch information
subosito authored Feb 4, 2022
2 parents 05b7251 + b3c14e7 commit 99cf465
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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
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 99cf465

Please sign in to comment.