From 15e45202131ac04864932970ec8a811cb560e5f9 Mon Sep 17 00:00:00 2001 From: Jef LeCompte Date: Tue, 10 Nov 2020 17:12:20 -0500 Subject: [PATCH] chore: pipeline changes (#753) --- .github/workflows/cd.yaml | 27 +++++++++++++++++---------- .github/workflows/ci.yaml | 4 ++-- Dockerfile | 3 ++- src/store/model/helpers/card.ts | 15 +++++---------- src/store/model/proshop-de.ts | 4 ++-- src/store/model/proshop-dk.ts | 4 ++-- src/store/model/store.ts | 4 +--- 7 files changed, 31 insertions(+), 30 deletions(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 70c79fb..b51c37a 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -3,10 +3,26 @@ on: push: branches: - main + - develop paths-ignore: - '**.md' jobs: - cd: + publish-nightly: + if: contains(github.ref, 'develop') + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: login into github package registry + run: echo ${{ secrets.CR_PAT }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin + - name: build nightly docker image + run: | + docker build \ + -t "ghcr.io/${GITHUB_REPOSITORY}:${GITHUB_SHA:0:7}" \ + -t "ghcr.io/${GITHUB_REPOSITORY}:nightly" . + - name: publish nightly + run: docker push "ghcr.io/${GITHUB_REPOSITORY}" + publish-latest: + if: contains(github.ref, 'main') runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -18,15 +34,6 @@ jobs: package-name: streetmerchant - name: login into github package registry run: echo ${{ secrets.CR_PAT }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin - - name: build nightly docker image - if: ${{ ! steps.release.outputs.release_created }} - run: | - docker build \ - -t "ghcr.io/${GITHUB_REPOSITORY}:${GITHUB_SHA:0:7}" \ - -t "ghcr.io/${GITHUB_REPOSITORY}:nightly" . - - name: publish nightly - if: ${{ ! steps.release.outputs.release_created }} - run: docker push "ghcr.io/${GITHUB_REPOSITORY}" - name: build latest docker image if: ${{ steps.release.outputs.release_created }} run: | diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 873ab13..1548f0e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -2,7 +2,7 @@ name: ci on: pull_request: branches: - - main + - develop paths-ignore: - '**.md' jobs: @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-node@v2.1.2 with: - node-version: 14 + node-version: 14.15.0 - uses: actions/cache@v2 with: path: ~/.npm diff --git a/Dockerfile b/Dockerfile index 55a81fe..5730957 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ -# Build the source code FROM node:14.15.0-alpine3.12 AS builder +LABEL org.opencontainers.image.source=https://github.com/jef/streetmerchant + ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true WORKDIR /build diff --git a/src/store/model/helpers/card.ts b/src/store/model/helpers/card.ts index b3ec5d3..7c3e376 100644 --- a/src/store/model/helpers/card.ts +++ b/src/store/model/helpers/card.ts @@ -1,9 +1,9 @@ -import {Link, Series} from '../store'; +import {Link, Model, Series} from '../store'; import {logger} from '../../../logger'; export interface Card { brand: string; - model: string; + model: Model; } interface LinksBuilderOptions { @@ -122,13 +122,8 @@ export function parseCard(name: string): Card | null { }); /* eslint-enable @typescript-eslint/prefer-regexp-exec */ - if (isOC) { - model.push('OC'); - } - - if (model.length === 0) { - return null; - } + if (isOC) model.push('oc'); + if (model.length === 0) return null; return { brand: brand.toLowerCase(), @@ -136,6 +131,6 @@ export function parseCard(name: string): Card | null { .join(' ') .toLowerCase() .replace(/ gaming\b/g, '') - .trim() + .trim() as Model }; } diff --git a/src/store/model/proshop-de.ts b/src/store/model/proshop-de.ts index a784ba3..7599610 100644 --- a/src/store/model/proshop-de.ts +++ b/src/store/model/proshop-de.ts @@ -27,7 +27,7 @@ export const ProshopDE: Store = { }, { brand: 'asus', - model: ' rog strix oc', + model: 'rog strix oc', series: '3070', url: 'https://www.proshop.de/2876845' }, @@ -129,7 +129,7 @@ export const ProshopDE: Store = { }, { brand: 'asus', - model: ' rog strix oc', + model: 'rog strix oc', series: '3080', url: 'https://www.proshop.de/2876859' }, diff --git a/src/store/model/proshop-dk.ts b/src/store/model/proshop-dk.ts index 4868131..8b0084b 100644 --- a/src/store/model/proshop-dk.ts +++ b/src/store/model/proshop-dk.ts @@ -75,14 +75,14 @@ export const ProshopDK: Store = { }, { brand: 'inno3d', - model: 'ichill 4x', + model: 'ichill x3', series: '3080', url: 'https://www.proshop.dk/Grafikkort/Inno3D-GeForce-RTX-3080-iCHILL-X4-10GB-GDDR6X-SDRAM-Grafikkort/2878971' }, { brand: 'inno3d', - model: 'ichill 3x', + model: 'ichill x3', series: '3080', url: 'https://www.proshop.dk/Grafikkort/Inno3D-GeForce-RTX-3080-iCHILL-X3-10GB-GDDR6X-SDRAM-Grafikkort/2878969' diff --git a/src/store/model/store.ts b/src/store/model/store.ts index 14b8cf1..4cf4147 100644 --- a/src/store/model/store.ts +++ b/src/store/model/store.ts @@ -67,9 +67,7 @@ export type Model = | 'gaming x3' | 'ichill x2' | 'ichill x3' - | 'ichill 3x' | 'ichill x4' - | 'ichill 4x' | 'gamerock oc' | 'gaming x trio' | 'gaming pro' @@ -123,7 +121,7 @@ export type Link = { brand: Brand; itemNumber?: string; series: Series; - model: Model | string; + model: Model; url: string; cartUrl?: string; openCartAction?: (browser: Browser) => Promise;