From 043db9b2577c79ff57f967a70775915fde884b1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fynn=20Fl=C3=BCgge?= Date: Mon, 18 Nov 2024 22:36:35 +0100 Subject: [PATCH] fix(ci): docker and electron publish (#160) --- .github/workflows/docker-build-and-publish.yaml | 2 +- .github/workflows/electron-build-and-publish.yaml | 5 +---- README.md | 4 ++-- landing-page/src/app/app.component.html | 2 +- webapp/package.json | 4 ++-- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/docker-build-and-publish.yaml b/.github/workflows/docker-build-and-publish.yaml index 3aa6448c..2c497f79 100644 --- a/.github/workflows/docker-build-and-publish.yaml +++ b/.github/workflows/docker-build-and-publish.yaml @@ -58,7 +58,7 @@ jobs: - name: Extract release tag id: get_tag - run: echo "RELEASE_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV + run: echo "RELEASE_TAG=$GITHUB_REF_NAME" >> $GITHUB_ENV - name: Build and push Docker image api uses: docker/build-push-action@v5 diff --git a/.github/workflows/electron-build-and-publish.yaml b/.github/workflows/electron-build-and-publish.yaml index 6c4005a5..8532c336 100644 --- a/.github/workflows/electron-build-and-publish.yaml +++ b/.github/workflows/electron-build-and-publish.yaml @@ -7,7 +7,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: macos-latest strategy: matrix: node-version: [18.x] @@ -33,9 +33,6 @@ jobs: with: node-version: ${{ matrix.node-version }} - - name: Install Snapcraft - uses: samuelmeuli/action-snapcraft@v3 - - name: Build electron app run: | cd webapp diff --git a/README.md b/README.md index f4cfeb83..ce3175f4 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ It utilizes a [100% Serverless RAG pipeline](https://medium.com/@fynnfluegge/ser - Run it 100% [locally with Docker](INSTALLATION.md#run-with-docker) - Host at [AWS](INSTALLATION.md#aws-hosting) - Check [Contribution Guide](CONTRIBUTING.md#contributing-guide) how to setup a local development environment - - If you are interested in contributing, visit [Contributing](README.md#Contributing) section for more details. + - If you are interested in contributing, visit [Contributing](README.md#contributing) section for more details. ## ✨ Features @@ -109,7 +109,7 @@ It utilizes a [100% Serverless RAG pipeline](https://medium.com/@fynnfluegge/ser ## Contributing -A good way to do the first contribution are the *good first issue* labelled issues [here](https://github.com/fynnfluegge/rocketnotes/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22). On some of the issues are already linked PRs with comments in the code what has to be done. These PRs can be picked up if not assigned to someone yet. +A good way to do the first contribution are the _good first issue_ labelled issues [here](https://github.com/fynnfluegge/rocketnotes/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22). On some of the issues are already linked PRs with comments in the code what has to be done. These PRs can be picked up if not assigned to someone yet. The most comfortable way to get started is to open the project in a ready-to-code Gitpod workspace with all packages & tools preinstalled and a running database with sample data. diff --git a/landing-page/src/app/app.component.html b/landing-page/src/app/app.component.html index cb6916bf..767a3bd6 100644 --- a/landing-page/src/app/app.component.html +++ b/landing-page/src/app/app.component.html @@ -23,7 +23,7 @@ macOS diff --git a/webapp/package.json b/webapp/package.json index a7bb16ea..656360fa 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -1,6 +1,6 @@ { "name": "webapp", - "version": "1.0.0", + "version": "1.0.2", "main": "electron.js", "scripts": { "ng": "ng", @@ -12,7 +12,7 @@ "build": "npm run config-prod && ng build --configuration production", "build-local": "export API_URL='http://localhost:3002' && npm run config-dev && ng build", "build-electron": "npm run config-prod && ng build --configuration production --base-href ./", - "bundle-electron": "./node_modules/.bin/electron-builder --publish always", + "bundle-electron": "./node_modules/.bin/electron-builder --publish always --mac --arm64", "test": "ng test" }, "private": true,