Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/build-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,22 @@ on:

jobs:
build_and_publish_frontend:
name: Build and publish frontend image for ${{ github.event.inputs.environment }}
environment: ${{ github.event.inputs.environment }}
name: Build and publish frontend image for ${{ inputs.environment }}
environment: ${{ inputs.environment }}
runs-on: ubuntu-latest
env:
DOCKER_LOGIN: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
DOCKER_REPO: ${{ secrets.DOCKER_REPO || 'olakego' }}
DOCKER_REPO_WORKER: ${{ secrets.DOCKER_REPO_WORKER || 'olakego' }}
ENVIRONMENT: ${{ github.event.inputs.environment }}
VERSION: ${{ github.event.inputs.version }}
ENVIRONMENT: ${{ inputs.environment }}
VERSION: ${{ inputs.version }}

steps:
- name: Checkout code
uses: actions/checkout@v3
with:
ref: ${{ github.event.inputs.environment == 'master' && 'master' || (github.event.inputs.environment == 'staging' && 'staging' || github.event.inputs.environment == 'dev' && 'ci/workerReleaseIssues' || 'develop') }}
ref: ${{ inputs.environment == 'master' && 'master' || (inputs.environment == 'staging' && 'staging' || inputs.environment == 'dev' && 'ci/workerReleaseIssues' || 'develop') }}

- name: Set up Node.js
uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/draft-release-and-changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
id: generate-next-version
run: |
if [ -z "$LATEST_TAG" ]; then
next_version="v0.1.0"
next_version="v0.0.5"
else
# Remove 'v' prefix and split version into array
version=${LATEST_TAG#v}
Expand Down
4 changes: 2 additions & 2 deletions server/cmd/temporal-worker/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func main() {
logsdir, _ := config.String("logsdir")
logger.InitLogger(logsdir)
// init database
postgresDB, _ := config.String("postgresdb")
postgresDB, _ := config.String("costcresdb")
err := database.Init(postgresDB)
if err != nil {
logs.Critical("Failed to initialize database: %s", err)
Expand Down Expand Up @@ -56,5 +56,5 @@ func main() {

// Stop the worker
worker.Stop()
logs.Info("Worker stopped. Goodbye!")
logs.Info("Worker stopped. Bye Bye!")
}
2 changes: 1 addition & 1 deletion server/conf/app.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ copyrequestbody = true
postgresdb = postgres://temporal:temporal@postgresql:5432/postgres?sslmode=disable
logsdir = ./logger/logs
sessionon = true
TEMPORAL_ADDRESS=temporal:7233
TEMPORAL_ADDRESS=temporal:7235
2 changes: 1 addition & 1 deletion server/routes/router.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ func writeDefaultCorsHeaders(w http.ResponseWriter) {
w.Header().Set("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS, PATCH")
w.Header().Set("Access-Control-Allow-Headers", "Origin, Authorization, Content-Type, Accept")
w.Header().Set("Access-Control-Allow-Credentials", "true")
w.Header().Set("Access-Control-Max-Age", "86400")
w.Header().Set("Access-Control-Max-Age", "12345")
}

// CustomCorsFilter handles CORS for different route patterns
Expand Down
Loading