Skip to content

Commit 58618f3

Browse files
committed
Rearrange step order for consistency
1 parent eadc457 commit 58618f3

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

.github/workflows/prep-release.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -74,19 +74,6 @@ jobs:
7474
packages: ${{ inputs.bootstrap_packages }}
7575
add-to-path: false
7676

77-
- name: Load data from cygport file
78-
shell: C:\cygwin\bin\bash.exe --noprofile --norc -e -o pipefail -o igncr {0}
79-
env:
80-
PATH: C:\cygwin\bin
81-
run: |
82-
vars_cmd=(cygport "$CYGPORT_FILE" vars NAME PVR PF ARCH)
83-
"${vars_cmd[@]}"
84-
eval "$("${vars_cmd[@]}")"
85-
printf 'CYGPORT_NAME=%s\n' "$NAME" | tee -a "$GITHUB_ENV"
86-
printf 'CYGPORT_PVR=%s\n' "$PVR" | tee -a "$GITHUB_ENV"
87-
printf 'CYGPORT_PF=%s\n' "$PF" | tee -a "$GITHUB_ENV"
88-
printf 'CYGPORT_ARCH=%s\n' "$ARCH" | tee -a "$GITHUB_ENV"
89-
9077
- name: Check if package cache needs updating
9178
if: always() && steps.install-bootstrap.outcome == 'success'
9279
working-directory: C:\
@@ -119,6 +106,19 @@ jobs:
119106
name: cygwin-logs
120107
path: C:\cygwin\var\log\
121108

109+
- name: Load data from cygport file
110+
shell: C:\cygwin\bin\bash.exe --noprofile --norc -e -o pipefail -o igncr {0}
111+
env:
112+
PATH: C:\cygwin\bin
113+
run: |
114+
vars_cmd=(cygport "$CYGPORT_FILE" vars NAME PVR PF ARCH)
115+
"${vars_cmd[@]}"
116+
eval "$("${vars_cmd[@]}")"
117+
printf 'CYGPORT_NAME=%s\n' "$NAME" | tee -a "$GITHUB_ENV"
118+
printf 'CYGPORT_PVR=%s\n' "$PVR" | tee -a "$GITHUB_ENV"
119+
printf 'CYGPORT_PF=%s\n' "$PF" | tee -a "$GITHUB_ENV"
120+
printf 'CYGPORT_ARCH=%s\n' "$ARCH" | tee -a "$GITHUB_ENV"
121+
122122
- name: Get build cache
123123
id: build-cache
124124
uses: actions/cache/restore@v3

0 commit comments

Comments
 (0)