Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
* master:
  chore: for windows use tag for release (#158)
  chore: bump version (#157)
  docs: move TL;DR; up
  docs: adds a TL;DR; to usage (#156)
  feat: adds command local to bind localhost:80 (#151)
  chore: shell nix uses latest go version
  docs: adds nix and source to installation summary (#155)
  • Loading branch information
cristianoliveira committed Jun 9, 2024
2 parents c273660 + 5f1ccf2 commit 3bd7e99
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/on-release-upload-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Release artifacts
on:
release:
types: [created]
workflow_dispatch:

jobs:
build_release_osx:
Expand Down Expand Up @@ -64,7 +65,7 @@ jobs:
GOOS: windows
GOARCH: amd64
TARGET: windows-amd64
RELEASE_TAG: v0.3.2
RELEASE_TAG: ${{ github.event.release.tag_name }}

runs-on: windows-latest

Expand Down
12 changes: 11 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,22 @@

See more on [examples](https://github.com/cristianoliveira/ergo/tree/master/examples)

## TL;DR;
```bash
python3 -m http.server 8800 &
echo "http://localhost:8800 mylocalsite" > .ergo
ergo local & # may need sudo since it binds to port 80
curl http://mylocalsite.localhost
```

## Summary
* [Philosophy](#philosophy)
* [Installation](#installation)
- [osx](#osx)
- [linux](#linux)
- [windows](#windows)
- [nix](#nix)
- [from source](#go)
* [Usage](#usage)
* [Configuration](#configuration)
* [Testing](#run-tests)
Expand Down Expand Up @@ -77,7 +87,7 @@ _You can also find the Windows executables in [release](https://github.com/crist
***Disclaimer:***
I use Unix-based systems on a daily basis, so I am not able to test each build alone. :(

### Nix with flakes
### Nix

Create a `flake.nix` with the following content:

Expand Down
2 changes: 1 addition & 1 deletion proxy/proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func ServeProxy(config *Config) error {

http.HandleFunc("/proxy.pac", proxy(config))

http.HandleFunc("/_ergo/list", list(config))
http.HandleFunc("/__ergo__/", list(config))

http.Handle("/", NewErgoProxy(config))

Expand Down
2 changes: 1 addition & 1 deletion shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pkgs.mkShell {
# buildInputs is for dependencies you'd need "at run time",
# were you to to use nix-build not nix-shell and build whatever you were working on
buildInputs = [
pkgs.go_1_22
pkgs.go
];

shell = pkgs.zsh;
Expand Down

0 comments on commit 3bd7e99

Please sign in to comment.