Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clean up unused methods to run and deploy the site #483

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Clean up unused methods to run and deploy the site #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 0 additions & 42 deletions .github/workflows/deploy-prod.yml
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,41 +31,6 @@
// see tasks.json for definition
"preLaunchTask": "dev build", // The name of the task defined above
"request": "attach"
},
{
"name": "Run Dev Under Docker",
"type": "shell",
// see tasks.json for definition
"preLaunchTask": "dev", // The name of the task defined above
"request": "attach"
},
{
"name": "Run Dev with Metrics",
"type": "shell",
// see tasks.json for definition
"preLaunchTask": "dev-metrics", // The name of the task defined above
"request": "attach"
},
{
"name": "Deploy Production",
"type": "shell",
// see tasks.json for definition
"preLaunchTask": "deploy-prod", // The name of the task defined above
"request": "attach"
},
{
"name": "Run Tests",
"type": "shell",
// see tasks.json for definition
"preLaunchTask": "tests", // The name of the task defined above
"request": "attach"
},
{
"name": "Run Help",
"type": "shell",
// see tasks.json for definition
"preLaunchTask": "help", // The name of the task defined above
"request": "attach"
}
]
}
54 changes: 0 additions & 54 deletions .vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,60 +41,6 @@
"_id": "test",
"isDefault": false
}
},
{
"label": "dev build",
"type": "shell",
"command": "bash",
"args": ["-c", "make dev-build"],
"problemMatcher": [],
"group": {
"_id": "build",
"isDefault": false
}
},
{
"label": "dev",
"type": "shell",
"command": "bash",
"args": ["-c", "make dev"],
"problemMatcher": [],
"group": {
"_id": "test",
"isDefault": false
}
},
{
"label": "dev-metrics",
"type": "shell",
"command": "bash",
"args": ["-c", "make dev-metrics"],
"problemMatcher": []
},
{
"label": "deploy-prod",
"type": "shell",
"command": "bash",
"args": ["-c", "make deploy-prod"],
"problemMatcher": [],
"group": {
"_id": "test",
"isDefault": false
}
},
{
"label": "tests",
"type": "shell",
"command": "bash",
"args": ["-c", "make dev-metrics"],
"problemMatcher": []
},
{
"label": "help",
"type": "shell",
"command": "bash",
"args": ["-c", "make help"],
"problemMatcher": []
}
]
}
59 changes: 0 additions & 59 deletions .vscode/tasks.json.old
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions Dockerfile
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions Dockerfile.dev
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions Dockerfile.tests
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,6 @@ help:
@echo "------------------------------------------------------------------"
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m - %s\n", $$1, $$2}'

# ----------------------------------------------------------------------------
# D O C K E R C O M M A N D S
# ----------------------------------------------------------------------------

dev-build: ## Generate the development docker container
docker build --rm -f Dockerfile.dev -t qgis_hugo_dev:latest .

dev: dev-build ## Run the development hugo container
docker run --rm -it -v "$${PWD}":/app -w /app -p $${HOST_IP:-127.0.0.1}:1313:1313 qgis_hugo_dev:latest

dev-metrics: dev-build ## Run the development hugo container with metrics
docker run --rm -it -v "$${PWD}":/app -w /app -p $${HOST_IP:-127.0.0.1}:1313:1313 qgis_hugo_dev:latest serve -D --bind 0.0.0.0 --templateMetrics --templateMetricsHints

deploy-prod: ## Deploy everything to production
docker build -t qgis.org .
docker-compose -f ~/docker-compose.yml up -d qgis_hugo_prod
docker image prune -af

tests: ## Run the test suite
docker build --rm -f Dockerfile.tests -t qgis_hugo_tests:latest .
docker run --rm --net=host --volume "$${PWD}":/app -w /app qgis_hugo_tests:latest


# ----------------------------------------------------------------------------
# P R O D U C T I O N C O M M A N D S
# ----------------------------------------------------------------------------
Expand Down
10 changes: 10 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,16 @@ Once the site is running, you can open it at:

The site will automatically refresh any page you have open if you edit it and save your work. Magical eh?

## Run in other IDEs

Use an appropriate Hugo plugin for your IDE, or run Hugo från the command line:

```shell
hugo server
```

You can then visit the hot-reloaded site in your browser at `http://localhost:1313/`

## Running Playwright End to End (e2e) Tests

Test files are located in ```playwright/ci-test/tests```.
Expand Down
79 changes: 0 additions & 79 deletions docker-compose.yml
View file
Open in desktop

This file was deleted.