Resolve merge conflict in step method #971
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| name: testAndBuild | |
| on: [push, pull_request] | |
| # Controls when the action will run. Triggers the workflow on push or pull request | |
| # events but only for the master branch | |
| jobs: | |
| # This workflow contains a single job called "build" | |
| build: | |
| runs-on: ${{ matrix.os }} | |
| strategy: | |
| matrix: | |
| # Select platform(s) | |
| os: [ ubuntu-latest, windows-latest ] | |
| # Select compatible Smalltalk image(s) | |
| smalltalk: [ Squeak64-6.0 ] | |
| name: ${{ matrix.smalltalk }} on ${{ matrix.os }} | |
| steps: | |
| # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it | |
| - uses: actions/checkout@v2 | |
| - uses: hpi-swa/setup-smalltalkCI@v1 | |
| with: | |
| smalltalk-image: ${{ matrix.smalltalk }} | |
| env: | |
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | |
| - run: smalltalkci -s ${{ matrix.smalltalk }} | |
| timeout-minutes: 15 | |
| env: | |
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | |
| - run: ./scripts/build_image.sh | |
| if: matrix.os == 'ubuntu-latest' && (github.ref == 'refs/heads/main') | |
| shell: bash | |
| - name: Upload Image | |
| uses: actions/upload-artifact@v2 | |
| if: matrix.os == 'ubuntu-latest' && (github.ref == 'refs/heads/main') | |
| with: | |
| name: Babylonian-6.0.zip | |
| path: ./deploy/Babylonian-6.0.zip | |
| - name: Upload Image | |
| uses: actions/upload-artifact@v2 | |
| if: matrix.os == 'ubuntu-latest' && (github.ref == 'refs/heads/main') | |
| with: | |
| name: screenshot | |
| path: ./deploy/screenshot-for-readme.png |