From 75df9a0e053ba226c79ffa8dfed921a382c75d59 Mon Sep 17 00:00:00 2001 From: Mihovil Ilakovac Date: Wed, 14 Aug 2024 13:59:14 +0200 Subject: [PATCH 1/4] Update Haskell action --- .github/workflows/waspc-ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/waspc-ci.yaml b/.github/workflows/waspc-ci.yaml index 7cf040c585..eb60e055d1 100644 --- a/.github/workflows/waspc-ci.yaml +++ b/.github/workflows/waspc-ci.yaml @@ -95,7 +95,7 @@ jobs: - name: Set up Haskell id: setup-haskell-cabal - uses: haskell/actions/setup@v2 + uses: haskell-actions/setup@v2 with: ghc-version: ${{ matrix.ghc }} cabal-version: ${{ matrix.cabal }} From 5db073054f27b5f94379575dd199c136c84f1d2f Mon Sep 17 00:00:00 2001 From: Mihovil Ilakovac Date: Wed, 14 Aug 2024 14:01:48 +0200 Subject: [PATCH 2/4] Fixes typos in README --- waspc/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/waspc/README.md b/waspc/README.md index a6d2925187..90704567a9 100644 --- a/waspc/README.md +++ b/waspc/README.md @@ -11,15 +11,15 @@ If you would like to make your first contribution, here is a handy checklist we - [ ] Read [Quick overview](#quick-overview). - [ ] Compile the project successfully and get todoApp example running (follow [Basics](#basics)). - [ ] Join [Discord](https://discord.gg/rzdnErX) and say hi :)! -- [ ] Pick an issue [labeled with "good first issue"](https://github.com/wasp-lang/wasp/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) and let us know you would like to work on it - ideally immediatelly propose a plan of action and ask questions. +- [ ] Pick an issue [labeled with "good first issue"](https://github.com/wasp-lang/wasp/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) and let us know you would like to work on it - ideally immediately propose a plan of action and ask questions. If you can't find a suitable issue for you, reach out to us on Discord and we can try to find smth for you together. - [ ] Make a PR targeting `main` and have it accepted! Check [Typical workflow](#typical-development-workflow) and [Branching and merging strategy](#branching-and-merging-strategy) for guidance, and consult [Codebase overview](#codebase-overview) for more details on how Wasp compiler works internally. ## Quick overview -Wasp compiler is implemented in Haskell, but you will also see a lot of Javascript and other web technologies because Wasp compiles it's own code into them. +Wasp compiler is implemented in Haskell, but you will also see a lot of Javascript and other web technologies because Wasp compiles its own code into them. -You don't have to be expert in Haskell to contribute or understand the code, since we don't use complicated Haskell features much -> most of the code is relatively simple and straight-forward, and we are happy to help with the part that is not. +You don't have to be an expert in Haskell to contribute or understand the code, since we don't use complicated Haskell features much -> most of the code is relatively simple and straight-forward, and we are happy to help with the part that is not. Main result of building the project is `wasp` executable (also reffered to as CLI), which is both Wasp compiler, CLI and Wasp project runner in one - one tool for everything Wasp-related. From 5669db39de08ff162a0cdb75ba1d399e5763e093 Mon Sep 17 00:00:00 2001 From: Mihovil Ilakovac Date: Wed, 28 Aug 2024 11:54:56 +0200 Subject: [PATCH 3/4] Remove cancel action. Use MacOS 13. --- .github/workflows/waspc-ci.yaml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/waspc-ci.yaml b/.github/workflows/waspc-ci.yaml index eb60e055d1..61a6e2f7c7 100644 --- a/.github/workflows/waspc-ci.yaml +++ b/.github/workflows/waspc-ci.yaml @@ -24,16 +24,12 @@ defaults: shell: bash working-directory: waspc -jobs: - cancel: - name: Cancel redundant actions already in progress - runs-on: ubuntu-latest - steps: - - name: Cancel actions in progress of same workflow and same branch - uses: styfle/cancel-workflow-action@0.11.0 - with: - access_token: ${{ github.token }} +# Cancel other action runs for the same workflow and branch if one is in progress. +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: ${{ github.ref != 'refs/heads/main' }} +jobs: build: name: Build Wasp runs-on: ${{ matrix.os }} @@ -48,7 +44,8 @@ jobs: # Still looking into musl static binaries. # Ref: https://github.com/wasp-lang/wasp/issues/650 - ubuntu-20.04 - - macos-latest + # Not using macos-latest becuase of a bug in Haskell setup Github action: https://github.com/haskell-actions/setup/issues/77 + - macos-13 - windows-latest node-version: - 'latest' From 0eb764840ac488278270447c2bcd0f42ffaa7283 Mon Sep 17 00:00:00 2001 From: Mihovil Ilakovac Date: Wed, 28 Aug 2024 11:57:39 +0200 Subject: [PATCH 4/4] Testing concurency --- .github/workflows/waspc-ci.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/waspc-ci.yaml b/.github/workflows/waspc-ci.yaml index 61a6e2f7c7..77236121f7 100644 --- a/.github/workflows/waspc-ci.yaml +++ b/.github/workflows/waspc-ci.yaml @@ -16,6 +16,11 @@ on: # (GH deletes it after 7 days of not using it). - cron: '0 0 * * 0' +# Cancel other action runs for the same workflow and branch if one is in progress. +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: ${{ github.ref != 'refs/heads/main' }} + env: WASP_TELEMETRY_DISABLE: 1 @@ -24,11 +29,6 @@ defaults: shell: bash working-directory: waspc -# Cancel other action runs for the same workflow and branch if one is in progress. -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: ${{ github.ref != 'refs/heads/main' }} - jobs: build: name: Build Wasp