From f9aa7adba24ebf231d52e1ce4d8ca80445ccb8b7 Mon Sep 17 00:00:00 2001 From: Christian Folie Date: Tue, 19 Mar 2024 18:27:58 +0100 Subject: [PATCH 01/23] initial --- .github/workflows/task1.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/workflows/task1.yaml diff --git a/.github/workflows/task1.yaml b/.github/workflows/task1.yaml new file mode 100644 index 0000000..8126929 --- /dev/null +++ b/.github/workflows/task1.yaml @@ -0,0 +1,11 @@ +name: example-workflow +on: + push: + pull_request: + # event - https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows +jobs: + example-job: + runs-on: ubuntu-latest + # system - https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories + steps: + - run: echo "Hello, World!" From 90f6b7e039bd556fb8c93831e3f5e2dbce24782c Mon Sep 17 00:00:00 2001 From: Christian Folie Date: Tue, 19 Mar 2024 18:31:24 +0100 Subject: [PATCH 02/23] github ref --- .github/workflows/task1.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/task1.yaml b/.github/workflows/task1.yaml index 8126929..a907019 100644 --- a/.github/workflows/task1.yaml +++ b/.github/workflows/task1.yaml @@ -8,4 +8,4 @@ jobs: runs-on: ubuntu-latest # system - https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories steps: - - run: echo "Hello, World!" + - run: echo "GITHUB REF ${GITHUB_REF}" From db28d58be22286bbab9297f0abd36946cde3f057 Mon Sep 17 00:00:00 2001 From: Christian Folie Date: Tue, 19 Mar 2024 18:34:08 +0100 Subject: [PATCH 03/23] refs --- .github/workflows/task1.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/task1.yaml b/.github/workflows/task1.yaml index a907019..f36a890 100644 --- a/.github/workflows/task1.yaml +++ b/.github/workflows/task1.yaml @@ -1,7 +1,6 @@ name: example-workflow on: push: - pull_request: # event - https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows jobs: example-job: @@ -9,3 +8,5 @@ jobs: # system - https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories steps: - run: echo "GITHUB REF ${GITHUB_REF}" + - run: echo "GITHUB Branch ${GITHUB_REF_NAME}" + - run: echo "COMMIT REF ${GITHUB_SHA}" From 0dbe5d98a3c640eb50b3a61ccbb5062c7636bb84 Mon Sep 17 00:00:00 2001 From: Alireza Fatehi Date: Tue, 19 Mar 2024 18:40:10 +0100 Subject: [PATCH 04/23] show list of files and direcoreis --- .github/workflows/task1.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/task1.yaml b/.github/workflows/task1.yaml index f36a890..7f37d9d 100644 --- a/.github/workflows/task1.yaml +++ b/.github/workflows/task1.yaml @@ -10,3 +10,4 @@ jobs: - run: echo "GITHUB REF ${GITHUB_REF}" - run: echo "GITHUB Branch ${GITHUB_REF_NAME}" - run: echo "COMMIT REF ${GITHUB_SHA}" + - run: ls -R From 849d44424bdcbd9ab21689cdf9c118166fe3b49c Mon Sep 17 00:00:00 2001 From: Alireza Fatehi Date: Tue, 19 Mar 2024 18:46:46 +0100 Subject: [PATCH 05/23] add checkout action --- .github/workflows/task1.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/task1.yaml b/.github/workflows/task1.yaml index 7f37d9d..b85fc21 100644 --- a/.github/workflows/task1.yaml +++ b/.github/workflows/task1.yaml @@ -10,4 +10,5 @@ jobs: - run: echo "GITHUB REF ${GITHUB_REF}" - run: echo "GITHUB Branch ${GITHUB_REF_NAME}" - run: echo "COMMIT REF ${GITHUB_SHA}" + - uses: actions/checkout@v4 - run: ls -R From ccbdd14a970abea275d8000cd811ec9155315d4b Mon Sep 17 00:00:00 2001 From: Christian Folie Date: Tue, 19 Mar 2024 18:52:20 +0100 Subject: [PATCH 06/23] task 2 --- .github/workflows/task2.yaml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/task2.yaml diff --git a/.github/workflows/task2.yaml b/.github/workflows/task2.yaml new file mode 100644 index 0000000..5a2ff43 --- /dev/null +++ b/.github/workflows/task2.yaml @@ -0,0 +1,21 @@ +name: example-workflow +on: + push: + # event - https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows +jobs: + example-job: + runs-on: ubuntu-latest + # system - https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories + steps: + - run: echo "GITHUB REF ${GITHUB_REF}" + - run: echo "GITHUB Branch ${GITHUB_REF_NAME}" + - run: echo "COMMIT REF ${GITHUB_SHA}" + - uses: actions/checkout@v4 + - name: Use Node.js + uses: actions/setup-node@v4 + with: + node-version: 'lts' + - run: npm ci + - run: npm run build --if-present + - run: npm test + From 262530d58cc09e4425e5cbbe0f38e617d0890184 Mon Sep 17 00:00:00 2001 From: Christian Folie Date: Tue, 19 Mar 2024 18:55:19 +0100 Subject: [PATCH 07/23] switch to latest --- .github/workflows/task2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/task2.yaml b/.github/workflows/task2.yaml index 5a2ff43..8e23b6e 100644 --- a/.github/workflows/task2.yaml +++ b/.github/workflows/task2.yaml @@ -14,7 +14,7 @@ jobs: - name: Use Node.js uses: actions/setup-node@v4 with: - node-version: 'lts' + node-version: 'latest' - run: npm ci - run: npm run build --if-present - run: npm test From c3b174ec04df29c9c7eb73ff347d52c887c6c460 Mon Sep 17 00:00:00 2001 From: Christian Folie Date: Tue, 19 Mar 2024 18:57:34 +0100 Subject: [PATCH 08/23] directory --- .github/workflows/task1.yaml | 2 +- .github/workflows/task2.yaml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/task1.yaml b/.github/workflows/task1.yaml index b85fc21..4815a6f 100644 --- a/.github/workflows/task1.yaml +++ b/.github/workflows/task1.yaml @@ -1,4 +1,4 @@ -name: example-workflow +name: task 1 workflow on: push: # event - https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows diff --git a/.github/workflows/task2.yaml b/.github/workflows/task2.yaml index 8e23b6e..e24e871 100644 --- a/.github/workflows/task2.yaml +++ b/.github/workflows/task2.yaml @@ -1,4 +1,4 @@ -name: example-workflow +name: task 2 workflow on: push: # event - https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows @@ -16,6 +16,9 @@ jobs: with: node-version: 'latest' - run: npm ci + working-directory: desktop-app - run: npm run build --if-present + working-directory: desktop-app - run: npm test + working-directory: desktop-app From a361f2963db5d7801fd691897157d885c040291c Mon Sep 17 00:00:00 2001 From: Christian Folie Date: Tue, 19 Mar 2024 19:01:12 +0100 Subject: [PATCH 09/23] caching --- .github/workflows/task2.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/task2.yaml b/.github/workflows/task2.yaml index e24e871..db2752c 100644 --- a/.github/workflows/task2.yaml +++ b/.github/workflows/task2.yaml @@ -15,6 +15,8 @@ jobs: uses: actions/setup-node@v4 with: node-version: 'latest' + cache: 'npm' + - run: npm ci working-directory: desktop-app - run: npm run build --if-present From 894fc017b57af533acd01ff2cab53abf047cd17c Mon Sep 17 00:00:00 2001 From: Christian Folie Date: Tue, 19 Mar 2024 19:05:44 +0100 Subject: [PATCH 10/23] working dir --- .github/workflows/task2.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/task2.yaml b/.github/workflows/task2.yaml index db2752c..6bb82ee 100644 --- a/.github/workflows/task2.yaml +++ b/.github/workflows/task2.yaml @@ -4,6 +4,9 @@ on: # event - https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows jobs: example-job: + defaults: + run: + working-directory: desktop-app runs-on: ubuntu-latest # system - https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories steps: @@ -16,11 +19,10 @@ jobs: with: node-version: 'latest' cache: 'npm' - + cache-dependency-path: package-lock.json + - run: npm ci - working-directory: desktop-app - run: npm run build --if-present - working-directory: desktop-app - run: npm test - working-directory: desktop-app + From cad78a75ad8ff4ffbb0aee5bcfcd779c6feab50d Mon Sep 17 00:00:00 2001 From: Christian Folie Date: Tue, 19 Mar 2024 19:08:28 +0100 Subject: [PATCH 11/23] clean --- .github/workflows/task2.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/task2.yaml b/.github/workflows/task2.yaml index 6bb82ee..6c01940 100644 --- a/.github/workflows/task2.yaml +++ b/.github/workflows/task2.yaml @@ -4,15 +4,13 @@ on: # event - https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows jobs: example-job: + runs-on: ubuntu-latest defaults: run: - working-directory: desktop-app - runs-on: ubuntu-latest + working-directory: ./desktop-app + # system - https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories steps: - - run: echo "GITHUB REF ${GITHUB_REF}" - - run: echo "GITHUB Branch ${GITHUB_REF_NAME}" - - run: echo "COMMIT REF ${GITHUB_SHA}" - uses: actions/checkout@v4 - name: Use Node.js uses: actions/setup-node@v4 From 0d96f2b368faaf0ef82d3f3d7b9eb1fa21df3550 Mon Sep 17 00:00:00 2001 From: Christian Folie Date: Tue, 19 Mar 2024 19:12:12 +0100 Subject: [PATCH 12/23] remove --- .github/workflows/task2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/task2.yaml b/.github/workflows/task2.yaml index 6c01940..adc1a49 100644 --- a/.github/workflows/task2.yaml +++ b/.github/workflows/task2.yaml @@ -17,7 +17,7 @@ jobs: with: node-version: 'latest' cache: 'npm' - cache-dependency-path: package-lock.json + # cache-dependency-path: package-lock.json - run: npm ci - run: npm run build --if-present From 669e0db11913119104d0ff5313e4f60bbd653722 Mon Sep 17 00:00:00 2001 From: Christian Folie Date: Tue, 19 Mar 2024 19:14:33 +0100 Subject: [PATCH 13/23] remove working dir --- .github/workflows/task2.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/task2.yaml b/.github/workflows/task2.yaml index adc1a49..e052d45 100644 --- a/.github/workflows/task2.yaml +++ b/.github/workflows/task2.yaml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest defaults: run: - working-directory: ./desktop-app + # working-directory: ./desktop-app # system - https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories steps: @@ -17,10 +17,13 @@ jobs: with: node-version: 'latest' cache: 'npm' - # cache-dependency-path: package-lock.json + cache-dependency-path: desktop-app/package-lock.json - run: npm ci + working-directory: ./desktop-app - run: npm run build --if-present + working-directory: ./desktop-app - run: npm test + working-directory: ./desktop-app From 3d6572ea0849c50f6e12c879cc385229771cce93 Mon Sep 17 00:00:00 2001 From: Christian Folie Date: Tue, 19 Mar 2024 19:15:29 +0100 Subject: [PATCH 14/23] yaml --- .github/workflows/task2.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/task2.yaml b/.github/workflows/task2.yaml index e052d45..8a09218 100644 --- a/.github/workflows/task2.yaml +++ b/.github/workflows/task2.yaml @@ -5,8 +5,8 @@ on: jobs: example-job: runs-on: ubuntu-latest - defaults: - run: + # defaults: + # run: # working-directory: ./desktop-app # system - https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories From c4393d968b78ba96fd0f6aadd4139108c207f170 Mon Sep 17 00:00:00 2001 From: Christian Folie Date: Tue, 19 Mar 2024 19:37:32 +0100 Subject: [PATCH 15/23] working dir --- .github/workflows/task2.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/task2.yaml b/.github/workflows/task2.yaml index 8a09218..86f5dc3 100644 --- a/.github/workflows/task2.yaml +++ b/.github/workflows/task2.yaml @@ -5,9 +5,9 @@ on: jobs: example-job: runs-on: ubuntu-latest - # defaults: - # run: - # working-directory: ./desktop-app + defaults: + run: + working-directory: ./desktop-app # system - https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories steps: @@ -20,10 +20,8 @@ jobs: cache-dependency-path: desktop-app/package-lock.json - run: npm ci - working-directory: ./desktop-app - run: npm run build --if-present - working-directory: ./desktop-app - run: npm test - working-directory: ./desktop-app + From 8bfe5d4f398e8ddc248caadbc69260c685b3bbe6 Mon Sep 17 00:00:00 2001 From: Christian Folie Date: Tue, 19 Mar 2024 19:41:18 +0100 Subject: [PATCH 16/23] fixiing --- desktop-app/src/utils/index.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop-app/src/utils/index.ts b/desktop-app/src/utils/index.ts index e168c95..36dbdf5 100644 --- a/desktop-app/src/utils/index.ts +++ b/desktop-app/src/utils/index.ts @@ -1,4 +1,7 @@ // @ts-ignore export function sum(a: number, b: number, c: number | undefined = undefined) { - return a + b; + if(c) + return a+ b +c; + else + return a + b; } From 9209781affd28551a02d16344dbaaa2422653bc9 Mon Sep 17 00:00:00 2001 From: Christian Folie Date: Tue, 19 Mar 2024 19:46:52 +0100 Subject: [PATCH 17/23] task 3 --- .github/workflows/task3.yaml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/task3.yaml diff --git a/.github/workflows/task3.yaml b/.github/workflows/task3.yaml new file mode 100644 index 0000000..cc827e5 --- /dev/null +++ b/.github/workflows/task3.yaml @@ -0,0 +1,30 @@ +name: task 3 workflow +on: + push: + paths: + - desktop-app/**.ts + # event - https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows +jobs: + example-job: + runs-on: ubuntu-latest + defaults: + run: + working-directory: ./desktop-app + + # system - https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories + steps: + - uses: actions/checkout@v4 + - name: Use Node.js + uses: actions/setup-node@v4 + with: + node-version: 'latest' + cache: 'npm' + cache-dependency-path: desktop-app/package-lock.json + + - run: npm ci + + - run: npm run build --if-present + - run: npm test + + + From fb987a67a4bcc4ab68fea0c064e3cd0e9d8c2432 Mon Sep 17 00:00:00 2001 From: Christian Folie Date: Tue, 19 Mar 2024 19:48:23 +0100 Subject: [PATCH 18/23] change --- desktop-app/src/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop-app/src/constants.ts b/desktop-app/src/constants.ts index d1dbaac..9410a9d 100644 --- a/desktop-app/src/constants.ts +++ b/desktop-app/src/constants.ts @@ -5,4 +5,4 @@ export const AMAZONS = [ { name: "Włochy", url: "https://www.amazon.it" }, { name: "Francja", url: "https://www.amazon.fr" }, { name: "Hiszpania", url: "https://www.amazon.es" }, -]; +]; From e3eb20fab6074e802402c8148a1cac431e01f9f0 Mon Sep 17 00:00:00 2001 From: Christian Folie Date: Tue, 19 Mar 2024 19:51:31 +0100 Subject: [PATCH 19/23] task 4 --- .github/workflows/task4.yaml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/task4.yaml diff --git a/.github/workflows/task4.yaml b/.github/workflows/task4.yaml new file mode 100644 index 0000000..7fab75e --- /dev/null +++ b/.github/workflows/task4.yaml @@ -0,0 +1,31 @@ +name: task 4 workflow +on: + push: + paths: + - desktop-app/**.ts + # event - https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows +jobs: + example-job: + runs-on: ubuntu-latest + defaults: + run: + working-directory: ./desktop-app + + # system - https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories + steps: + - uses: actions/checkout@v4 + - name: Use Node.js + uses: actions/setup-node@v4 + with: + node-version: 'latest' + cache: 'npm' + cache-dependency-path: desktop-app/package-lock.json + + - run: npm ci + + - run: npm run build --if-present + - run: npm test + - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run e2e + + + From e7742d8020c405ad731210740463e142e4db33f0 Mon Sep 17 00:00:00 2001 From: Christian Folie Date: Tue, 19 Mar 2024 19:54:33 +0100 Subject: [PATCH 20/23] change --- desktop-app/src/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop-app/src/constants.ts b/desktop-app/src/constants.ts index 9410a9d..5676d3a 100644 --- a/desktop-app/src/constants.ts +++ b/desktop-app/src/constants.ts @@ -5,4 +5,4 @@ export const AMAZONS = [ { name: "Włochy", url: "https://www.amazon.it" }, { name: "Francja", url: "https://www.amazon.fr" }, { name: "Hiszpania", url: "https://www.amazon.es" }, -]; +]; \ No newline at end of file From 5d89590c81d41766ad6a12732bae72b46d428227 Mon Sep 17 00:00:00 2001 From: Christian Folie Date: Tue, 19 Mar 2024 19:56:19 +0100 Subject: [PATCH 21/23] should fail --- desktop-app/src/e2e/basic.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop-app/src/e2e/basic.test.ts b/desktop-app/src/e2e/basic.test.ts index 8850336..1f9b6c7 100644 --- a/desktop-app/src/e2e/basic.test.ts +++ b/desktop-app/src/e2e/basic.test.ts @@ -8,5 +8,5 @@ electronTest("Window has correct title", async ({ page }) => { const title = await page.title(); - expect(title).toBe("Vite + React + TS"); + expect(title).toBe("asdfasdfsaReact + TS"); }) \ No newline at end of file From 19508f9baa57b9e869a8dcf5c657a24bfabe185b Mon Sep 17 00:00:00 2001 From: Christian Folie Date: Tue, 19 Mar 2024 20:05:00 +0100 Subject: [PATCH 22/23] archive --- .github/workflows/task4.yaml | 6 ++++++ desktop-app/src/constants.ts | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/task4.yaml b/.github/workflows/task4.yaml index 7fab75e..0744013 100644 --- a/.github/workflows/task4.yaml +++ b/.github/workflows/task4.yaml @@ -26,6 +26,12 @@ jobs: - run: npm run build --if-present - run: npm test - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run e2e + - uses: actions/upload-artifact@v4 + if: ${{ failure() }} + with: + name: failed-tests + path: | + desktop-app/test-results/** diff --git a/desktop-app/src/constants.ts b/desktop-app/src/constants.ts index 5676d3a..780472b 100644 --- a/desktop-app/src/constants.ts +++ b/desktop-app/src/constants.ts @@ -5,4 +5,4 @@ export const AMAZONS = [ { name: "Włochy", url: "https://www.amazon.it" }, { name: "Francja", url: "https://www.amazon.fr" }, { name: "Hiszpania", url: "https://www.amazon.es" }, -]; \ No newline at end of file +]; \ No newline at end of file From a6e90704be8198227c1a592f3ee357b628abe537 Mon Sep 17 00:00:00 2001 From: Christian Folie Date: Tue, 19 Mar 2024 20:12:21 +0100 Subject: [PATCH 23/23] tests --- .github/workflows/task4.yaml | 2 +- desktop-app/src/e2e/basic.test.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/task4.yaml b/.github/workflows/task4.yaml index 0744013..bdf3bb4 100644 --- a/.github/workflows/task4.yaml +++ b/.github/workflows/task4.yaml @@ -23,7 +23,7 @@ jobs: - run: npm ci - - run: npm run build --if-present + - run: npm run build - run: npm test - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run e2e - uses: actions/upload-artifact@v4 diff --git a/desktop-app/src/e2e/basic.test.ts b/desktop-app/src/e2e/basic.test.ts index 1f9b6c7..bbc269d 100644 --- a/desktop-app/src/e2e/basic.test.ts +++ b/desktop-app/src/e2e/basic.test.ts @@ -8,5 +8,5 @@ electronTest("Window has correct title", async ({ page }) => { const title = await page.title(); - expect(title).toBe("asdfasdfsaReact + TS"); + expect(title).toBe("React + TS"); }) \ No newline at end of file