diff --git a/.env b/.env index cdb8484..252825e 100644 --- a/.env +++ b/.env @@ -5,4 +5,6 @@ # See the documentation for all the connection string options: https://pris.ly/d/connection-strings DATABASE_URL="postgresql://postgres:123@localhost:5434/nest?schema=public" -JWT_SECRET = 'super-secret' \ No newline at end of file +JWT_SECRET = 'super-secret' +PORT=3000 +ENV_MESSAGE="Hello! I am NestJS" \ No newline at end of file diff --git a/.env.test b/.env.test index 1fb8edc..28a2d75 100644 --- a/.env.test +++ b/.env.test @@ -1,2 +1,4 @@ DATABASE_URL="postgresql://postgres:123@localhost:5435/nest?schema=public" -JWT_SECRET = 'super-secret' \ No newline at end of file +JWT_SECRET = 'super-secret' +PORT=3000 +ENV_MESSAGE="Hello! I am NestJS" \ No newline at end of file diff --git a/.github/workflows/railway-preview.yml b/.github/workflows/railway-preview.yml index e39144b..40a0ae5 100644 --- a/.github/workflows/railway-preview.yml +++ b/.github/workflows/railway-preview.yml @@ -10,7 +10,7 @@ permissions: issues: write concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number }} + group: ${{ github.workflow }}-${{ github.head_ref }} cancel-in-progress: true jobs: @@ -22,17 +22,41 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 + - name: Sanitize branch name + id: sanitize + run: | + BRANCH_NAME="${{ github.head_ref }}" + # Create a short hash of the branch name for uniqueness + HASH=$(echo -n "$BRANCH_NAME" | sha256sum | cut -c1-8) + # Sanitize branch name: lowercase, alphanumeric and hyphens only, max 20 chars + SANITIZED_BRANCH=$(echo "$BRANCH_NAME" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9-]/-/g' | sed 's/-\+/-/g' | sed 's/^-\|-$//g' | cut -c1-20 | sed 's/-$//') + # Combine: pr-{short-branch}-{hash} but limit total to 30 chars + if [ -n "$SANITIZED_BRANCH" ] && [[ "$SANITIZED_BRANCH" =~ ^[a-z] ]]; then + # Use branch name if valid and starts with letter + SANITIZED="${SANITIZED_BRANCH}-${HASH}" + else + # Fallback to PR number with hash + SANITIZED="pr${{ github.event.pull_request.number }}-${HASH}" + fi + # Ensure it starts with a letter and limit to 30 characters + if [[ ! "$SANITIZED" =~ ^[a-z] ]]; then + SANITIZED="e${SANITIZED}" + fi + SANITIZED="${SANITIZED:0:30}" + SANITIZED="${SANITIZED%-}" + echo "sanitized=$SANITIZED" >> $GITHUB_OUTPUT + - name: Deploy to Railway uses: ayungavis/railway-preview-deploy@v1.0.2 with: railway_api_token: ${{ secrets.RAILWAY_API_TOKEN }} project_id: ${{ secrets.RAILWAY_PROJECT_ID }} environment_name: 'production' - preview_environment_name: 'pr-${{ github.event.pull_request.number }}' - environment_variables: | - { - "DATABASE_URL": "postgres://username:password@hostname/db" - } + preview_environment_name: '${{ steps.sanitize.outputs.sanitized }}' + # environment_variables: | + # { + # "DATABASE_URL": "postgres://username:password@hostname/db" + # } branch_name: ${{ github.head_ref }} - name: Post deployment info @@ -40,7 +64,7 @@ jobs: echo "Preview deployed at ${{ steps.deploy.outputs.service_domain }}" - name: Post or update deployment comment - if: ${{ steps.test-action.outputs.service_domain != '' }} + if: ${{ steps.deploy.outputs.service_domain != '' }} uses: actions/github-script@v7 with: script: | @@ -66,7 +90,7 @@ jobs: ${marker} 🚀 **Deployment success!** - - \`web\` deployed at [${{ steps.test-action.outputs.service_domain }}](https://${{ steps.test-action.outputs.service_domain }}) + - \`web\` deployed at [${{ steps.deploy.outputs.service_domain }}](https://${{ steps.deploy.outputs.service_domain }}) --- @@ -104,12 +128,36 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 + - name: Sanitize branch name + id: sanitize + run: | + BRANCH_NAME="${{ github.head_ref }}" + # Create a short hash of the branch name for uniqueness + HASH=$(echo -n "$BRANCH_NAME" | sha256sum | cut -c1-8) + # Sanitize branch name: lowercase, alphanumeric and hyphens only, max 20 chars + SANITIZED_BRANCH=$(echo "$BRANCH_NAME" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9-]/-/g' | sed 's/-\+/-/g' | sed 's/^-\|-$//g' | cut -c1-20 | sed 's/-$//') + # Combine: pr-{short-branch}-{hash} but limit total to 30 chars + if [ -n "$SANITIZED_BRANCH" ] && [[ "$SANITIZED_BRANCH" =~ ^[a-z] ]]; then + # Use branch name if valid and starts with letter + SANITIZED="${SANITIZED_BRANCH}-${HASH}" + else + # Fallback to PR number with hash + SANITIZED="pr${{ github.event.pull_request.number }}-${HASH}" + fi + # Ensure it starts with a letter and limit to 30 characters + if [[ ! "$SANITIZED" =~ ^[a-z] ]]; then + SANITIZED="e${SANITIZED}" + fi + SANITIZED="${SANITIZED:0:30}" + SANITIZED="${SANITIZED%-}" + echo "sanitized=$SANITIZED" >> $GITHUB_OUTPUT + - name: Cleanup Railway Environment uses: ayungavis/railway-preview-deploy@v1.0.2 with: railway_api_token: ${{ secrets.RAILWAY_API_TOKEN }} project_id: ${{ secrets.RAILWAY_PROJECT_ID }} environment_name: production - preview_environment_name: 'pr-${{ github.event.pull_request.number }}' + preview_environment_name: '${{ steps.sanitize.outputs.sanitized }}' branch_name: ${{ github.head_ref }} cleanup: 'true' \ No newline at end of file diff --git a/src/app.controller.ts b/src/app.controller.ts index 6202e57..9fe0ecd 100644 --- a/src/app.controller.ts +++ b/src/app.controller.ts @@ -4,6 +4,6 @@ import { Controller, Get } from '@nestjs/common'; export class AppController { @Get() getHello(): string { - return 'hello'; + return process.env.ENV_MESSAGE || 'hello'; } }