Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
pelazas committed Apr 27, 2024
2 parents 3619957 + 55cc781 commit 7527956
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,12 @@ jobs:
contents: read
packages: write
#needs: [e2e-tests]
env:
WEBAPP_URI: http://conoceryvencer.xyz
steps:
- uses: actions/checkout@v4
- name: Publish to Registry
uses: elgohr/Publish-Docker-Github-Action@v5
env:
WEBAPP_URI: http://conoceryvencer.xyz
with:
name: arquisoft/wiq_en2a/multiplayerservice
username: ${{ github.actor }}
Expand Down
2 changes: 1 addition & 1 deletion multiplayerservice/.env
Original file line number Diff line number Diff line change
@@ -1 +1 @@
WEBAPP_ENPOINT ="http://localhost"
WEBAPP_ENDPOINT=http://localhost
2 changes: 1 addition & 1 deletion multiplayerservice/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"main": "service.js",
"scripts": {
"start": "node server.js",
"start:prod": "cross-env WEBAPP_ENDPOINT=http://localhost node server.js",
"start:prod": "node server.js",
"test": "jest"
},
"repository": {
Expand Down
4 changes: 2 additions & 2 deletions multiplayerservice/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ require('dotenv').config();
const io = socketIo(server, {
cors: {
//origin: 'http://conoceryvencer.xyz',
origin: process.env.WEBAPP_ENPOINT || 'http://localhost',
origin: process.env.WEBAPP_ENDPOINT || 'http://localhost',
//origin: 'http://localhost:3000',
methods: ['GET', 'POST'],
credentials: true
}
});

console.log(process.env.WEBAPP_ENPOINT)
console.log(process.env.WEBAPP_ENDPOINT)
const parties = {};

const lobby = {};
Expand Down

0 comments on commit 7527956

Please sign in to comment.