Fix windows build (for real this time?) (#3289)

Summary:
This previous attempt didn't work. Not even sure what happens now, it seems to just return the result of a boolean evaluation? Cool.

Still haven't verified that this works in the release build but noticed that we do effectively the same in the build step. By upgrading to the same revision of the action we use and then switching from `&&` to simply `;`, we can be reasonably sure that this will work now.

The alternative would be to switch to `pwsh` which appears to be the new name. `powershell` is the default shell and seems to be an older version without support for `&&`. I honestly never want to touch this or read about it again, so let's go with the simpler option.

Pull Request resolved: https://github.com/facebook/flipper/pull/3289

Reviewed By: aigoncharov

Differential Revision: D33582853

Pulled By: passy

fbshipit-source-id: 7c70ff360a5c327139b6ecb5463e85883a2caf9d
This commit is contained in:
Pascal Hartig
2022-01-14 06:29:50 -08:00
committed by Facebook GitHub Bot
parent 7f8545bc94
commit 9451911709
2 changed files with 5 additions and 13 deletions

View File

@@ -33,7 +33,7 @@ jobs:
restore-keys: | restore-keys: |
${{ runner.os }}-yarn- ${{ runner.os }}-yarn-
- name: yarn install (with retry) - name: yarn install (with retry)
uses: nick-invision/retry@v2.4.0 uses: nick-invision/retry@v2.6.0
with: with:
command: cd ${{env.desktop-directory}}; yarn command: cd ${{env.desktop-directory}}; yarn
timeout_minutes: 30 timeout_minutes: 30

View File

@@ -126,28 +126,20 @@ jobs:
with: with:
timeout_minutes: 10 timeout_minutes: 10
max_attempts: 3 max_attempts: 3
command: (cd ${{env.desktop-directory}}) -and (yarn) shell: pwsh
command: cd ${{env.desktop-directory}}; yarn
- name: Build - name: Build
uses: nick-invision/retry@v2.6.0 uses: nick-invision/retry@v2.6.0
with: with:
timeout_minutes: 30 timeout_minutes: 30
max_attempts: 3 max_attempts: 3
command: (cd ${{env.desktop-directory}}) -and (yarn build --win) shell: pwsh
command: cd ${{env.desktop-directory}}; yarn build --win
- name: Upload Windows - name: Upload Windows
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
with: with:
name: 'Flipper-win.zip' name: 'Flipper-win.zip'
path: 'dist/Flipper-win.zip' path: 'dist/Flipper-win.zip'
- name: Open issue on failure
if: failure()
uses: JasonEtco/create-an-issue@v2.4.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
REPOSITORY: ${{ github.repository }}
RUN_ID: ${{ github.run_id }}
WORKFLOW_NAME: "Release"
with:
filename: .github/action-failure-template.md
build-flipper-server: build-flipper-server:
needs: needs: