Skip to content

Commit

Permalink
Merge branch 'refaktor:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
xypwn authored Jul 27, 2024
2 parents be652c2 + f823282 commit 76dad8a
Show file tree
Hide file tree
Showing 24 changed files with 981 additions and 336 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
image:
- macos-latest
- ubuntu-latest
# - windows-latest
- windows-latest
runs-on: ${{ matrix.image }}

steps:
Expand Down Expand Up @@ -70,6 +70,7 @@ jobs:
timeout-minutes: 1

- name: Build WASM
if: runner.os == 'Linux'
run: |
GOOS=js GOARCH=wasm go build -v -tags "b_tiny" -o wasm/rye.wasm main_wasm.go
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
cache: false

- name: golangci-lint
uses: golangci/golangci-lint-action@v5
uses: golangci/golangci-lint-action@v6
with:
# Require: The version of golangci-lint to use.
# When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:

- name: Run GoReleaser
id: goreleaser
uses: goreleaser/goreleaser-action@v5
uses: goreleaser/goreleaser-action@v6
with:
# either 'goreleaser' (default) or 'goreleaser-pro':
distribution: goreleaser
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
persist-credentials: false

- name: "Run analysis"
uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
with:
results_file: results.sarif
results_format: sarif
Expand Down
12 changes: 6 additions & 6 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
# This is an example .goreleaser.yml file with some sensible defaults.
# Make sure to check the documentation at https://goreleaser.com

# The lines bellow are called `modelines`. See `:help modeline`
# The lines below are called `modelines`. See `:help modeline`
# Feel free to remove those if you don't want/need to use them.
# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
# vim: set ts=2 sw=2 tw=0 fo=cnqoj

version: 2

before:
hooks:
# You may remove this if you don't use go modules.
Expand All @@ -18,7 +20,7 @@ builds:
- CGO_ENABLED=0
goos:
- linux
# - windows
- windows
- darwin
- js
goarch:
Expand All @@ -28,10 +30,8 @@ builds:
- wasm

ignore: # List of combinations of GOOS + GOARCH + GOARM to ignore.
# - goos: windows
# goarch: arm64
# - goos: windows
# goarch: arm
- goos: windows
goarch: arm

flags:
- -tags=b_tiny
Expand Down
23 changes: 13 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -158,18 +158,15 @@ The author of Factor once said that at the end *it's not about the language, but

legend: ⭐ priority , 🧪 tests

## Rye-front project (GUI)
## External extension: rye-fyne - a GUI toolkit

If you are interested in "fontend" / desktop technologies check out separate project that works on extending Rye lanuage with GUI, Game engine and a Webview. It
integrates these cool Go libraries:

* Fyne - Cross platform Material design inspired GUI framework ⭐⭐
* Ebitengine - 2d game engine
* Webview - Webview GUI
Fyne is a cross platform pure **Go** GUI toolkit that we're integrating into Rye. A lot of widgets already work but it's not finished yet.

![Fyne Feedback example](https://ryelang.org/rye-fyne-2.png)

**[Visit Rye-front repo](https://github.com/refaktor/rye-front)**
* **[Rye-fyne repository](https://github.com/refaktor/rye-fyne)**
* ![Rye-fyne demo video](https://youtu.be/L4gPrXBI8UY?si=4QIDws9c3ub-5reY)
* [Fyne website](https://fyne.io)

## Follow development

Expand All @@ -187,14 +184,20 @@ If code speaks to you, our Github page is the central location for all things Ry

## Getting Rye

Rye is developed on Linux and Mac, but we also have a Docker and as WASM module. If you need additional architecture or OS, post an Issue. Rye could run anywhere Go compiles to.
Rye is developed and should work on Linux and Mac and Windows. We also have a Docker and as WASM modules. If you need additional architecture or OS, post an Issue. Rye could run anywhere Go compiles to.

### Binaries

You can find precompiled Binaries for **Linux** and **macOS** under [Releases](https://github.com/refaktor/rye/releases).

Docker images are published under [Packages](https://github.com/refaktor/rye/pkgs/container/rye).

### Homebrew

Rye is avaliable for instalation through brew command: `brew install ryelang`

More about it: [Homebrew formulae](https://formulae.brew.sh/formula/ryelang#default)

### Docker images

#### Binary Docker image
Expand Down Expand Up @@ -299,7 +302,7 @@ Rye has Syntax highlighting for Emacs and VS Code. For VS Code just search for *

[Arturo](https://arturo-lang.io/) - Another unique language that builds on Rebol's core ideas.

[Charm](https://github.com/tim-hardcastle/Charm) - Not related to Rebol, but an interesting Go based language with some similar runtime ideas and challenges.
[Pipefish](https://github.com/tim-hardcastle/Charm) - Not related to Rebol, but an interesting Go based language with some similar runtime ideas and challenges.

[Ren-c](https://github.com/metaeducation/ren-c) - Rebol 3 fork maintained by HostileFork, more liberal with changes to the language.

Expand Down
2 changes: 1 addition & 1 deletion env/env.go
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ func (i RyeCtx) Equal(o Object) bool {
if i.locked != oCtx.locked {
return false
}
return false
return true
}

func (i RyeCtx) Dump(e Idxs) string {
Expand Down
Loading

0 comments on commit 76dad8a

Please sign in to comment.