From 36ec22ec275ebda0b6b07b34ed02bbedeede895e Mon Sep 17 00:00:00 2001 From: Mo Tarbin Date: Thu, 25 Jul 2024 00:19:37 -0400 Subject: [PATCH 1/6] Update Go Release workflow to include frontend build and copy step --- .github/workflows/go-release.yml | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/.github/workflows/go-release.yml b/.github/workflows/go-release.yml index bbf1b1c..9a607c7 100644 --- a/.github/workflows/go-release.yml +++ b/.github/workflows/go-release.yml @@ -5,14 +5,36 @@ permissions: on: push: - tags: - - 'v*' + branches: + - dev jobs: build: runs-on: ubuntu-latest steps: - name: Checkout Code uses: actions/checkout@v4 + - name: Checkout Frontebd + uses: actions/checkout@v4 + with: + repository: 'donetick/donetick-frontend' + token: ${{ secrets.GITHUB_TOKEN }} + path: 'frontend' + # build frontend + - name: Install Node.js + uses: actions/setup-node@v2 + with: + node-version: '16' + - name: Install Dependencies + run: | + cd frontend + npm install + - name: Build Frontend + run: | + cd frontend + npm run build + - name: Copy Frontend + run: | + cp -r frontend/dist core/frontend/dist - name: Set up Go uses: actions/setup-go@v5 From d75fbf03be508ed93854336462344e7ebe4c3014 Mon Sep 17 00:00:00 2001 From: Mo Tarbin Date: Thu, 25 Jul 2024 00:21:09 -0400 Subject: [PATCH 2/6] Fix Project name --- .github/workflows/go-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/go-release.yml b/.github/workflows/go-release.yml index 9a607c7..b67e961 100644 --- a/.github/workflows/go-release.yml +++ b/.github/workflows/go-release.yml @@ -13,10 +13,10 @@ jobs: steps: - name: Checkout Code uses: actions/checkout@v4 - - name: Checkout Frontebd + - name: Checkout Frontend uses: actions/checkout@v4 with: - repository: 'donetick/donetick-frontend' + repository: 'donetick/frontend' token: ${{ secrets.GITHUB_TOKEN }} path: 'frontend' # build frontend From 632baef054df36614705940cc51ad46972d6050d Mon Sep 17 00:00:00 2001 From: Mo Tarbin Date: Thu, 25 Jul 2024 00:24:40 -0400 Subject: [PATCH 3/6] Update Go Release workflow to include frontend build and copy step --- .github/workflows/go-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/go-release.yml b/.github/workflows/go-release.yml index b67e961..25ab6ab 100644 --- a/.github/workflows/go-release.yml +++ b/.github/workflows/go-release.yml @@ -18,7 +18,7 @@ jobs: with: repository: 'donetick/frontend' token: ${{ secrets.GITHUB_TOKEN }} - path: 'frontend' + path: 'frontend-code' # build frontend - name: Install Node.js uses: actions/setup-node@v2 @@ -34,7 +34,7 @@ jobs: npm run build - name: Copy Frontend run: | - cp -r frontend/dist core/frontend/dist + cp -r frontend-code/dist frontend/dist - name: Set up Go uses: actions/setup-go@v5 From e598e25bec69395e5398ae2f03f8ebc3e15a8db4 Mon Sep 17 00:00:00 2001 From: Mo Tarbin Date: Thu, 25 Jul 2024 00:27:32 -0400 Subject: [PATCH 4/6] Update frontend build and copy step in Go Release workflow --- .github/workflows/go-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/go-release.yml b/.github/workflows/go-release.yml index 25ab6ab..f492814 100644 --- a/.github/workflows/go-release.yml +++ b/.github/workflows/go-release.yml @@ -26,11 +26,11 @@ jobs: node-version: '16' - name: Install Dependencies run: | - cd frontend + cd frontend-code npm install - name: Build Frontend run: | - cd frontend + cd frontend-code npm run build - name: Copy Frontend run: | From b9293c40102ff3e42d2c04939830df04b8aae989 Mon Sep 17 00:00:00 2001 From: Mo Tarbin Date: Thu, 25 Jul 2024 00:31:40 -0400 Subject: [PATCH 5/6] Update Go Release workflow to include frontend build and copy step --- .github/workflows/go-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/go-release.yml b/.github/workflows/go-release.yml index f492814..f7a2ee5 100644 --- a/.github/workflows/go-release.yml +++ b/.github/workflows/go-release.yml @@ -5,8 +5,8 @@ permissions: on: push: - branches: - - dev + tags: + - 'v*' jobs: build: runs-on: ubuntu-latest From 5459dc27888047ec10a3bf26c99c7b24753b1a4c Mon Sep 17 00:00:00 2001 From: Mo Tarbin Date: Thu, 25 Jul 2024 00:40:55 -0400 Subject: [PATCH 6/6] Add Support for mac --- .goreleaser.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 3a008a5..30c2e88 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -21,7 +21,7 @@ builds: goos: - linux # - windows - # - darwin + - darwin archives: - format: tar.gz