From 197b10cccf6c40c5fe1a70f2aa5abb06f78e5910 Mon Sep 17 00:00:00 2001
From: Neshura <neshura@noreply.forgejo.neshweb.net>
Date: Wed, 20 Dec 2023 21:27:22 +0000
Subject: [PATCH 1/5] Update .forgejo/workflows/build+release.yml
---
.forgejo/workflows/build+release.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.forgejo/workflows/build+release.yml b/.forgejo/workflows/build+release.yml
index 570df28..6c1955b 100644
--- a/.forgejo/workflows/build+release.yml
+++ b/.forgejo/workflows/build+release.yml
@@ -35,8 +35,7 @@ jobs:
-
name: Check if Version in package.json matches Tag
run: |
- echo "Test"
- VERSION=$(cat package.json | grep "version" | sed 's/.*://' | tr -d , | tr -d \" )
+ VERSION=$(cat package.json | grep "version" | sed 's/.*://' | tr -d , | tr -d \" | tr -d " " )
if test $VERSION != "${{ github.ref_name }}"; then
echo "Expected Version is: '${{ github.ref_name }}' actual Version is: '$VERSION'";
exit 1
From 8fda8a730950a0c59e1fed6c3cda8fa24a9ba989 Mon Sep 17 00:00:00 2001
From: Neshura <neshura@neshweb.net>
Date: Wed, 20 Dec 2023 22:32:28 +0100
Subject: [PATCH 2/5] Remove Gitlab CI & Fix Dockerfile
---
.gitlab-ci.yml | 65 --------------------------------------------------
Dockerfile | 1 +
2 files changed, 1 insertion(+), 65 deletions(-)
delete mode 100644 .gitlab-ci.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index e8e1c18..0000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-stages:
- - lint
- #- test
- - build
- - deploy
-
-variables:
- IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
- IMAGE_LATEST: $CI_REGISTRY_IMAGE:develop
-
-
-.node:
- image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/node:latest
-
-
-.docker:
- image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/docker:20
- rules:
- - if: $CI_COMMIT_TAG && $CI_COMMIT_TAG !~ /(^t)+.*/
- variables:
- IMAGE_LATEST: $CI_REGISTRY_IMAGE:latest
- - if: $CI_COMMIT_TAG
-
-
-linter:
- image: !reference [.node, image]
- stage: lint
- before_script:
- - yarn install
- script:
- - yarn lint
-
-
-build:
- image: !reference [.docker, image]
- stage: build
- before_script:
- - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- script:
- - docker build -t $IMAGE_TAG .
- after_script:
- - docker save $IMAGE_TAG > docker.tar
- artifacts:
- expire_in: 30 mins
- paths:
- - docker.tar
- rules:
- - !reference [.docker, rules]
-
-
-push:
- image: !reference [.docker, image]
- stage: deploy
- needs:
- - job: build
- artifacts: true
- before_script:
- - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- - docker load -i docker.tar
- script:
- - docker tag $IMAGE_TAG $IMAGE_LATEST
- - docker push $IMAGE_TAG
- - docker push $IMAGE_LATEST
- rules:
- - !reference [.docker, rules]
diff --git a/Dockerfile b/Dockerfile
index de808cd..645c82d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,6 +7,7 @@ WORKDIR /app
# Copy the files needed to install deps
COPY package.json yarn.lock ./
+RUN yarn add sharp
RUN yarn install --frozen-lockfile
## BUILD STEP
From a5e6c6fa3b2690645ebd3c69fa476493414cc58b Mon Sep 17 00:00:00 2001
From: Neshura <neshura@neshweb.net>
Date: Wed, 20 Dec 2023 22:32:39 +0100
Subject: [PATCH 3/5] Release 0.1.8
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 1f521bc..f5d1313 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "readyornot",
- "version": "0.1.7",
+ "version": "0.1.8",
"private": true,
"scripts": {
"dev:debug": "NODE_OPTIONS='--inspect' next dev -H :: -p 8002",
From a54baf4b3dd740d9e5c862c7d2a884a734c11203 Mon Sep 17 00:00:00 2001
From: Neshura <neshura@noreply.forgejo.neshweb.net>
Date: Mon, 1 Jan 2024 20:42:26 +0000
Subject: [PATCH 4/5] Setup registry for buildx + Update CI to current defaults
---
.forgejo/workflows/build+release.yml | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/.forgejo/workflows/build+release.yml b/.forgejo/workflows/build+release.yml
index 6c1955b..44bb69d 100644
--- a/.forgejo/workflows/build+release.yml
+++ b/.forgejo/workflows/build+release.yml
@@ -5,7 +5,7 @@ on:
push:
tags:
- '[0-9]+.[0-9]+.[0-9]+'
- - '[0-9]+.[0-9]+.[0-9]+rc[0-9]+'
+ - '[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+'
jobs:
test:
runs-on: docker
@@ -51,6 +51,10 @@ jobs:
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
+ with:
+ config-inline: |
+ [registry."docker.io"]
+ mirrors = ["https://docker-cache.neshweb.net"]
-
name: Login to Docker Hub
uses: docker/login-action@v3
@@ -58,12 +62,22 @@ jobs:
registry: forgejo.neshweb.net
username: ${{ secrets.FORGEJO_USERNAME }}
password: ${{ secrets.FORGEJO_TOKEN }}
+ -
+ name: Determine Docker tags
+ id: tags
+ run: |
+ if echo ${{ github.ref_name }} | grep -qi '\-rc' ; then
+ echo latest=forgejo.neshweb.net/neshweb-sites/${{ github.event.repository.name }}:preview >> $GITHUB_OUTPUT;
+ else
+ echo latest=forgejo.neshweb.net/neshweb-sites/${{ github.event.repository.name }}:latest >> $GITHUB_OUTPUT;
+ fi
+ echo version=forgejo.neshweb.net/neshweb-sites/${{ github.event.repository.name }}:${{ github.ref_name }} >> $GITHUB_OUTPUT;
-
name: Push to Package Registry
uses: docker/build-push-action@v5
with:
push: true
- tags: forgejo.neshweb.net/neshweb-sites/readyornot:${{ github.ref_name }}, forgejo.neshweb.net/neshweb-sites/readyornot:latest
+ tags: ${{ steps.tags.outputs.version }}, ${{ steps.tags.outputs.latest }}
release:
needs: build
From 025ff6a42fd934fbb9e244d49321c1c7da91a5b7 Mon Sep 17 00:00:00 2001
From: Neshura <neshura@noreply.forgejo.neshweb.net>
Date: Mon, 1 Jan 2024 20:51:22 +0000
Subject: [PATCH 5/5] Fix indenting
---
.forgejo/workflows/build+release.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.forgejo/workflows/build+release.yml b/.forgejo/workflows/build+release.yml
index 44bb69d..2b43104 100644
--- a/.forgejo/workflows/build+release.yml
+++ b/.forgejo/workflows/build+release.yml
@@ -37,10 +37,10 @@ jobs:
run: |
VERSION=$(cat package.json | grep "version" | sed 's/.*://' | tr -d , | tr -d \" | tr -d " " )
if test $VERSION != "${{ github.ref_name }}"; then
- echo "Expected Version is: '${{ github.ref_name }}' actual Version is: '$VERSION'";
- exit 1
+ echo "Expected Version is: '${{ github.ref_name }}' actual Version is: '$VERSION'";
+ exit 1
else
- echo "Version is: '$VERSION'";
+ echo "Version is: '$VERSION'";
fi
build: