Skip to content

Commit

Permalink
Merge pull request #19 from fa2a5qj3/FIX_CI
Browse files Browse the repository at this point in the history
Fix CI by using bisq backend servers.
  • Loading branch information
HenrikJannsen authored Dec 14, 2024
2 parents 9e59b69 + fdcbb7f commit 051b527
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion frontend/cypress/e2e/mainnet/mainnet.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ describe('Mainnet', () => {
});
});

it('loads skeleton when changes between networks', () => {
it.skip('loads skeleton when changes between networks', () => {
cy.visit('/');
cy.waitForSkeletonGone();

Expand Down
2 changes: 1 addition & 1 deletion frontend/cypress/e2e/signet/signet.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ describe('Signet', () => {
});


if (baseModule === 'mempool') {
if (false /* signet not supported by mempool.bisq.services */) {
it('loads the dashboard', () => {
cy.visit('/signet');
cy.waitForSkeletonGone();
Expand Down
2 changes: 1 addition & 1 deletion frontend/cypress/e2e/testnet/testnet.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ describe('Testnet', () => {
cy.intercept('/api/tx/*/outspends').as('tx-outspends');
});

if (baseModule === 'mempool') {
if (false /* testnet not supported by mempool.bisq.services */) {

it('loads the dashboard', () => {
cy.visit('/testnet');
Expand Down
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"cypress:run": "cypress run",
"cypress:run:record": "cypress run --record",
"cypress:open:ci": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true BISQ_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:local-prod 4200 cypress:open",
"cypress:run:ci": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true BISQ_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:local-prod 4200 cypress:run:record",
"cypress:run:ci": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true BISQ_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:local-prod 4200 cypress:run",
"cypress:open:ci:staging": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true BISQ_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:local-staging 4200 cypress:open",
"cypress:run:ci:staging": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true BISQ_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:local-staging 4200 cypress:run:record"
},
Expand Down
8 changes: 4 additions & 4 deletions frontend/proxy.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ PROXY_CONFIG = [
'!/liquidtestnet', '!/liquidtestnet/**', '!/liquidtestnet/',
'/testnet/api/**', '/signet/api/**'
],
target: "https://mempool.space",
target: "https://mempool.bisq.services",
ws: true,
secure: false,
changeOrigin: true
},
{
context: ['/api/v1/ws'],
target: "https://mempool.space",
target: "https://mempool.bisq.services",
ws: true,
secure: false,
changeOrigin: true,
Expand Down Expand Up @@ -68,7 +68,7 @@ PROXY_CONFIG = [
},
{
context: ['/resources/mining-pools/**'],
target: "https://mempool.space",
target: "https://mempool.bisq.services",
secure: false,
changeOrigin: true
}
Expand All @@ -86,7 +86,7 @@ if (configContent && configContent.BASE_MODULE == "liquid") {
} else {
PROXY_CONFIG.push({
context: ['/resources/assets.json', '/resources/assets.minimal.json', '/resources/worldmap.json'],
target: "https://mempool.space",
target: "https://mempool.bisq.services",
secure: false,
changeOrigin: true,
});
Expand Down

0 comments on commit 051b527

Please sign in to comment.