From bb1d28e0b6b6475dfb2a19e9b79a0a7b481a14e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Loipf=C3=BChrer?= Date: Tue, 2 Jan 2024 22:32:41 +0100 Subject: [PATCH] ci: fix app signing --- .github/workflows/backend.yaml | 16 +++++++------- .github/workflows/frontend.yaml | 22 +++++++++---------- .github/workflows/pull_request.yaml | 14 ++++++++++++ .github/workflows/push_on_master.yaml | 14 +++++++----- .../src/lib/transactions/transactionSlice.ts | 2 +- 5 files changed, 41 insertions(+), 27 deletions(-) diff --git a/.github/workflows/backend.yaml b/.github/workflows/backend.yaml index 5ae429c..46771d3 100644 --- a/.github/workflows/backend.yaml +++ b/.github/workflows/backend.yaml @@ -6,9 +6,9 @@ jobs: pylint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python 3.10 - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: "3.10" - name: Install dependencies @@ -19,9 +19,9 @@ jobs: mypy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python 3.10 - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: "3.10" - name: Install dependencies @@ -57,9 +57,9 @@ jobs: TEST_DB_DATABASE: "abrechnung" TEST_DB_PASSWORD: "password" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -70,9 +70,9 @@ jobs: format: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python 3.10 - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: "3.10" - name: Install dependencies diff --git a/.github/workflows/frontend.yaml b/.github/workflows/frontend.yaml index b383785..8c975c1 100644 --- a/.github/workflows/frontend.yaml +++ b/.github/workflows/frontend.yaml @@ -9,9 +9,9 @@ jobs: run: working-directory: frontend steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Nodejs - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: "18" cache: "npm" @@ -27,9 +27,9 @@ jobs: run: working-directory: frontend steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Nodejs - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: "18" cache: "npm" @@ -45,9 +45,9 @@ jobs: run: working-directory: frontend steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Nodejs - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: "18" cache: "npm" @@ -63,9 +63,9 @@ jobs: run: working-directory: frontend steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Nodejs - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: "18" cache: "npm" @@ -81,10 +81,9 @@ jobs: run: working-directory: frontend steps: - - uses: actions/checkout@v3 - + - uses: actions/checkout@v4 - name: Set up Nodejs - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: "18" cache: "npm" @@ -109,7 +108,6 @@ jobs: uses: gradle/gradle-build-action@v2 - name: Write gradle.properties to include signing key configuration for android release build - if: ${{ !failure() && !cancelled() && startsWith(github.ref, 'refs/heads/master')}} env: KEYSTORE: ${{ secrets.ANDROID_KEYSTORE_B64 }} KEYSTORE_ALIAS: ${{ secrets.ANDROID_KEY_STORE_ALIAS }} diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index e3e7ad1..c20778b 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -5,6 +5,20 @@ on: jobs: build_and_test_frontend: uses: ./.github/workflows/frontend.yaml + secrets: inherit build_and_test_backend: uses: ./.github/workflows/backend.yaml + secrets: inherit + + release-test: + name: "Attach assets to release" + needs: + - build_and_test_frontend + runs-on: ubuntu-latest + steps: + - name: Download all workflow run artifacts + uses: actions/download-artifact@v2 + - name: List stuff + run: | + ls -lah frontend/apps/mobile/android/app/build/outputs/apk/release/ diff --git a/.github/workflows/push_on_master.yaml b/.github/workflows/push_on_master.yaml index 038478c..0873cc2 100644 --- a/.github/workflows/push_on_master.yaml +++ b/.github/workflows/push_on_master.yaml @@ -15,16 +15,18 @@ env: jobs: build_and_test_frontend: uses: ./.github/workflows/frontend.yaml + secrets: inherit build_and_test_backend: uses: ./.github/workflows/backend.yaml + secrets: inherit get-distros: name: "Calculate list of debian distros and docker image tags" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 - id: set-distros run: | # if we're running from a tag, get the full list of distros; otherwise just use debian:sid @@ -47,9 +49,9 @@ jobs: needs: - get-distros steps: - - uses: actions/checkout@master + - uses: actions/checkout@v4 - name: Set up Nodejs - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: "18" cache: "npm" @@ -112,7 +114,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: src @@ -130,7 +132,7 @@ jobs: restore-keys: | ${{ runner.os }}-buildx- - name: Set up python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 - name: Build the packages # see https://github.com/docker/build-push-action/issues/252 diff --git a/frontend/libs/redux/src/lib/transactions/transactionSlice.ts b/frontend/libs/redux/src/lib/transactions/transactionSlice.ts index a72e358..9f75b79 100644 --- a/frontend/libs/redux/src/lib/transactions/transactionSlice.ts +++ b/frontend/libs/redux/src/lib/transactions/transactionSlice.ts @@ -18,7 +18,7 @@ import { toISODateString } from "@abrechnung/utils"; import { createAsyncThunk, createSlice, Draft, PayloadAction } from "@reduxjs/toolkit"; import memoize from "proxy-memoize"; import { leaveGroup } from "../groups"; -import { IRootState, ITransactionRootState, StateStatus, TransactionSliceState, TransactionState } from "../types"; +import { IRootState, StateStatus, TransactionSliceState, TransactionState } from "../types"; import { addEntity, getGroupScopedState, removeEntity } from "../utils"; export const initializeGroupState = (state: Draft, groupId: number) => {