caperren/caperren-com
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Remove project version, set fixed httpd version
All checks were successful
Build and Test - Staging / build_and_push (pull_request) Successful in 2m24s
Details
Build and Test - Staging / test (pull_request) Successful in 2s
Details
Build and Test - Staging / deploy_staging (pull_request) Successful in 5s
Details
Build and Test - Staging / determine_version (pull_request) Successful in 6m20s
Details

Browse Source
This commit is contained in:
Corwin Perren
2025-11-07 21:59:49 -08:00
parent 40a673a418
commit a807a39b09
5 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitea/workflows/build-production.yaml
View File

@@ -22,7 +22,6 @@ jobs:
run: | run: |
echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT
echo REPO_VERSION_HASH=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT echo REPO_VERSION_HASH=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT
echo PROJECT_VERSION=$(npm pkg get version --workspaces=false | tr -d \") >> $GITHUB_OUTPUT
build_and_push: build_and_push:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@@ -54,7 +53,6 @@ jobs:
gitea.perren.cloud/caperren/caperren-com:latest gitea.perren.cloud/caperren/caperren-com:latest
build-args: | build-args: |
REPO_VERSION_HASH=${{ needs.determine_version.outputs.repo_version_hash }} REPO_VERSION_HASH=${{ needs.determine_version.outputs.repo_version_hash }}
PROJECT_VERSION=${{ needs.determine_version.outputs.project_version }}
BUILD_ENVIRONMENT=production BUILD_ENVIRONMENT=production
test: test:

2
.gitea/workflows/build-staging.yaml
View File

@@ -22,7 +22,6 @@ jobs:
run: | run: |
echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT
echo REPO_VERSION_HASH=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT echo REPO_VERSION_HASH=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT
echo PROJECT_VERSION=$(npm pkg get version --workspaces=false | tr -d \") >> $GITHUB_OUTPUT
build_and_push: build_and_push:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@@ -52,7 +51,6 @@ jobs:
gitea.perren.cloud/caperren/caperren-com:latest-staging gitea.perren.cloud/caperren/caperren-com:latest-staging
build-args: | build-args: |
REPO_VERSION_HASH=${{ needs.determine_version.outputs.repo_version_hash }} REPO_VERSION_HASH=${{ needs.determine_version.outputs.repo_version_hash }}
PROJECT_VERSION=${{ needs.determine_version.outputs.project_version }}
BUILD_ENVIRONMENT=staging BUILD_ENVIRONMENT=staging
test: test:

11
Dockerfile
View File

@@ -8,23 +8,18 @@ COPY package.json package-lock.json tsconfig.json astro.config.mjs ./
FROM base AS prod-deps FROM base AS prod-deps
RUN npm install --omit=dev RUN npm install --omit=dev
FROM base AS build-deps FROM prod-deps AS build
RUN npm install
FROM build-deps AS build
COPY . . COPY . .
ARG REPO_VERSION_HASH ARG REPO_VERSION_HASH
ARG BUILD_ENVIRONMENT ARG BUILD_ENVIRONMENT
ARG PROJECT_VERSION
RUN echo "PUBLIC_REPO_VERSION_HASH=\"${REPO_VERSION_HASH}\" \n\ RUN echo "PUBLIC_REPO_VERSION_HASH=\"${REPO_VERSION_HASH}\" \n\
PUBLIC_BUILD_ENVIRONMENT=\"${BUILD_ENVIRONMENT}\" \n\ PUBLIC_BUILD_ENVIRONMENT=\"${BUILD_ENVIRONMENT}\"" >> .env
PUBLIC_PROJECT_VERSION=\"${PROJECT_VERSION}\"" >> .env
RUN npm run build RUN npm run build
FROM httpd:latest AS runtime FROM httpd:2.4 AS runtime
WORKDIR /usr/local/apache2/htdocs WORKDIR /usr/local/apache2/htdocs
RUN rm index.html RUN rm index.html

2
src/components/Footer.astro
View File

@@ -3,5 +3,5 @@
<footer class="fixed bottom-0 left-0 z-20 w-full px-6 py-2 bg-black border-t border-t-caperren-green-dark text-caperren-green-dark text-sm flex items-center justify-between"> <footer class="fixed bottom-0 left-0 z-20 w-full px-6 py-2 bg-black border-t border-t-caperren-green-dark text-caperren-green-dark text-sm flex items-center justify-between">
<span>{import.meta.env.PUBLIC_BUILD_ENVIRONMENT || "development"}</span> <span>{import.meta.env.PUBLIC_BUILD_ENVIRONMENT || "development"}</span>
<span>{import.meta.env.PUBLIC_REPO_VERSION_HASH || "invalid"}@{import.meta.env.PUBLIC_PROJECT_VERSION || "0.0.0"}</span> <span>{import.meta.env.PUBLIC_REPO_VERSION_HASH || "invalid"}</span>
</footer> </footer>

1
src/env.d.ts vendored
View File

@@ -1,6 +1,5 @@
interface ImportMetaEnv { interface ImportMetaEnv {
readonly PUBLIC_REPO_VERSION_HASH: string; readonly PUBLIC_REPO_VERSION_HASH: string;
readonly PUBLIC_PROJECT_VERSION: string;
readonly PUBLIC_BUILD_ENVIRONMENT: string; readonly PUBLIC_BUILD_ENVIRONMENT: string;
} }