Skip to content

Commit 75c66e5

Browse files
Fix broken user_settings.h flip in windows-check workflow
1 parent 281e4bc commit 75c66e5

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

.github/workflows/windows-check.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,12 @@ jobs:
4343
working-directory: ${{env.GITHUB_WORKSPACE}}wolfssl
4444
run: nuget restore ${{env.WOLFSSL_SOLUTION_FILE_PATH}}
4545

46-
- name: updated user_settings.h for sshd and x509
46+
- name: Update user_settings.h for sshd and x509
4747
working-directory: ${{env.GITHUB_WORKSPACE}}
48-
run: cp ${{env.USER_SETTINGS_H_NEW}} ${{env.USER_SETTINGS_H}}
49-
50-
- name: replace wolfSSL user_settings.h with wolfSSH user_settings.h
51-
working-directory: ${{env.GITHUB_WORKSPACE}}
52-
run: get-content ${{env.USER_SETTINGS_H_NEW}} | %{$_ -replace "if 0","if 1"}
48+
shell: bash
49+
run: |
50+
sed -i 's/#if 0/#if 1/g' ${{env.USER_SETTINGS_H_NEW}}
51+
cp ${{env.USER_SETTINGS_H_NEW}} ${{env.USER_SETTINGS_H}}
5352
5453
- name: Build wolfssl library
5554
working-directory: ${{env.GITHUB_WORKSPACE}}wolfssl
@@ -117,11 +116,12 @@ jobs:
117116

118117
# These env paths already include the wolfssh/ and wolfssl/ checkout
119118
# prefixes, so they must run from the workspace root (as the build job does).
120-
- name: updated user_settings.h for sshd and x509
121-
run: cp ${{env.USER_SETTINGS_H_NEW}} ${{env.USER_SETTINGS_H}}
122-
123-
- name: replace wolfSSL user_settings.h with wolfSSH user_settings.h
124-
run: get-content ${{env.USER_SETTINGS_H_NEW}} | %{$_ -replace "if 0","if 1"}
119+
- name: Update user_settings.h for sshd and x509
120+
working-directory: ${{env.GITHUB_WORKSPACE}}
121+
shell: bash
122+
run: |
123+
sed -i 's/#if 0/#if 1/g' ${{env.USER_SETTINGS_H_NEW}}
124+
cp ${{env.USER_SETTINGS_H_NEW}} ${{env.USER_SETTINGS_H}}
125125
126126
# WholeProgramOptimization=false disables /GL so the v142-independent objects
127127
# link without a cross-version code-generation requirement (C1047).

0 commit comments

Comments
 (0)