Skip to content

Commit 628a143

Browse files
tristanpolandtristanpoland
authored
Merge pull request #195 from Far-Beyond-Dev/Working-towards-0.13.0
Working towards 0.13.0
2 parents 2515261 + 76b8394 commit 628a143

38 files changed

Lines changed: 4116 additions & 5995 deletions

‎.github/workflows/main.yml‎

Lines changed: 60 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -29,29 +29,31 @@ jobs:
2929
echo "should_release=false" >> $GITHUB_OUTPUT
3030
fi
3131
32-
# create-release:
33-
# needs: check-version
34-
# if: needs.check-version.outputs.should_release == 'true'
35-
# runs-on: ubuntu-latest
36-
# permissions:
37-
# contents: write
38-
# outputs:
39-
# upload_url: ${{ steps.create_release.outputs.upload_url }}
40-
# steps:
41-
# - uses: actions/checkout@v3
32+
create-release:
33+
needs: check-version
34+
if: needs.check-version.outputs.should_release == 'true'
35+
runs-on: ubuntu-latest
36+
permissions:
37+
contents: write
38+
outputs:
39+
upload_url: ${{ steps.create_release.outputs.upload_url }}
40+
steps:
41+
- uses: actions/checkout@v3
4242

43-
# - name: Create Release
44-
# id: create_release
45-
# env:
46-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
47-
# uses: softprops/action-gh-release@v1
48-
# with:
49-
# tag_name: v${{ needs.check-version.outputs.version }}
50-
# name: Release v${{ needs.check-version.outputs.version }}
51-
# draft: false
52-
# prerelease: false
43+
- name: Create Release
44+
id: create_release
45+
env:
46+
GITHUB_TOKEN: ${{ secrets.TOKEN_GITHUB }}
47+
uses: softprops/action-gh-release@v1
48+
with:
49+
tag_name: v${{ needs.check-version.outputs.version }}
50+
name: Release v${{ needs.check-version.outputs.version }}
51+
draft: false
52+
prerelease: false
5353

5454
build-release:
55+
needs: [check-version, create-release]
56+
if: needs.check-version.outputs.should_release == 'true'
5557
strategy:
5658
matrix:
5759
os: [ubuntu-latest, windows-latest, macos-latest]
@@ -86,43 +88,43 @@ jobs:
8688
command: build
8789
args: --release --target ${{ matrix.target }}
8890

89-
# - name: Generate SHA256
90-
# shell: bash
91-
# run: |
92-
# binary_path="target/${{ matrix.target }}/release/horizon"
93-
# if [ "${{ matrix.os }}" = "windows-latest" ]; then
94-
# binary_path="target/${{ matrix.target }}/release/horizon.exe"
95-
# fi
96-
#
97-
# if [ ! -f "$binary_path" ]; then
98-
# echo "Binary not found at $binary_path"
99-
# ls -la target/
100-
# ls -la target/${{ matrix.target }}/release/
101-
# exit 1
102-
# fi
103-
#
104-
# if [ "${{ matrix.os }}" = "windows-latest" ]; then
105-
# sha256sum "$binary_path" > "$binary_path.sha256"
106-
# else
107-
# shasum -a 256 "$binary_path" > "$binary_path.sha256"
108-
# fi
91+
- name: Generate SHA256
92+
shell: bash
93+
run: |
94+
binary_path="target/${{ matrix.target }}/release/horizon"
95+
if [ "${{ matrix.os }}" = "windows-latest" ]; then
96+
binary_path="target/${{ matrix.target }}/release/horizon.exe"
97+
fi
98+
99+
if [ ! -f "$binary_path" ]; then
100+
echo "Binary not found at $binary_path"
101+
ls -la target/
102+
ls -la target/${{ matrix.target }}/release/
103+
exit 1
104+
fi
105+
106+
if [ "${{ matrix.os }}" = "windows-latest" ]; then
107+
sha256sum "$binary_path" > "$binary_path.sha256"
108+
else
109+
shasum -a 256 "$binary_path" > "$binary_path.sha256"
110+
fi
109111
110-
# - name: Upload Binary
111-
# uses: actions/upload-release-asset@v1
112-
# env:
113-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
114-
# with:
115-
# upload_url: ${{ needs.create-release.outputs.upload_url }}
116-
# asset_path: ${{ matrix.bin_path }}
117-
# asset_name: ${{ matrix.asset_name }}
118-
# asset_content_type: application/octet-stream
112+
- name: Upload Binary
113+
uses: actions/upload-release-asset@v1
114+
env:
115+
GITHUB_TOKEN: ${{ secrets.TOKEN_GITHUB }}
116+
with:
117+
upload_url: ${{ needs.create-release.outputs.upload_url }}
118+
asset_path: ${{ matrix.bin_path }}
119+
asset_name: ${{ matrix.asset_name }}
120+
asset_content_type: application/octet-stream
119121

120-
# - name: Upload SHA256
121-
# uses: actions/upload-release-asset@v1
122-
# env:
123-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
124-
# with:
125-
# upload_url: ${{ needs.create-release.outputs.upload_url }}
126-
# asset_path: ${{ matrix.bin_path }}.sha256
127-
# asset_name: ${{ matrix.asset_name }}.sha256
128-
# asset_content_type: text/plain
122+
- name: Upload SHA256
123+
uses: actions/upload-release-asset@v1
124+
env:
125+
GITHUB_TOKEN: ${{ secrets.TOKEN_GITHUB }}
126+
with:
127+
upload_url: ${{ needs.create-release.outputs.upload_url }}
128+
asset_path: ${{ matrix.bin_path }}.sha256
129+
asset_name: ${{ matrix.asset_name }}.sha256
130+
asset_content_type: text/plain

‎.gitignore‎

Lines changed: 5 additions & 166 deletions
Original file line numberDiff line numberDiff line change
@@ -8,180 +8,18 @@ target/
88

99
# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
1010
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
11-
11+
server/Cargo.lock
1212

1313
# These are backup files generated by rustfmt
1414
**/*.rs.bk
1515

1616
# MSVC Windows builds of rustc generate these, which store debugging information
1717
*.pdb
1818

19-
##########
20-
# Python #
21-
##########
22-
23-
# Byte-compiled / optimized / DLL files
24-
__pycache__/
25-
*.py[cod]
26-
*$py.class
27-
28-
# C extensions
29-
*.so
30-
31-
# Distribution / packaging
32-
.Python
33-
build/
34-
develop-eggs/
35-
dist/
36-
downloads/
37-
eggs/
38-
.eggs/
39-
lib/
40-
lib64/
41-
parts/
42-
sdist/
43-
var/
44-
wheels/
45-
share/python-wheels/
46-
*.egg-info/
47-
.installed.cfg
48-
*.egg
49-
MANIFEST
50-
51-
# PyInstaller
52-
# Usually these files are written by a python script from a template
53-
# before PyInstaller builds the exe, so as to inject date/other infos into it.
54-
*.manifest
55-
*.spec
56-
57-
# Installer logs
58-
pip-log.txt
59-
pip-delete-this-directory.txt
60-
61-
# Unit test / coverage reports
62-
htmlcov/
63-
.tox/
64-
.nox/
65-
.coverage
66-
.coverage.*
67-
.cache
68-
nosetests.xml
69-
coverage.xml
70-
*.cover
71-
*.py,cover
72-
.hypothesis/
73-
.pytest_cache/
74-
cover/
75-
76-
# Translations
77-
*.mo
78-
*.pot
79-
80-
# Django stuff:
81-
*.log
82-
local_settings.py
83-
db.sqlite3
84-
db.sqlite3-journal
85-
86-
# Flask stuff:
87-
instance/
88-
.webassets-cache
89-
90-
# Scrapy stuff:
91-
.scrapy
92-
93-
# Sphinx documentation
94-
docs/_build/
95-
96-
# PyBuilder
97-
.pybuilder/
98-
target/
99-
100-
# Jupyter Notebook
101-
.ipynb_checkpoints
102-
103-
# IPython
104-
profile_default/
105-
ipython_config.py
106-
107-
# pyenv
108-
# For a library or package, you might want to ignore these files since the code is
109-
# intended to run in multiple environments; otherwise, check them in:
110-
# .python-version
111-
112-
# pipenv
113-
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
114-
# However, in case of collaboration, if having platform-specific dependencies or dependencies
115-
# having no cross-platform support, pipenv may install dependencies that don't work, or not
116-
# install all needed dependencies.
117-
#Pipfile.lock
118-
119-
# poetry
120-
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
121-
# This is especially recommended for binary packages to ensure reproducibility, and is more
122-
# commonly ignored for libraries.
123-
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
124-
#poetry.lock
125-
126-
# pdm
127-
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
128-
#pdm.lock
129-
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
130-
# in version control.
131-
# https://pdm.fming.dev/latest/usage/project/#working-with-version-control
132-
.pdm.toml
133-
.pdm-python
134-
.pdm-build/
135-
136-
# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
137-
__pypackages__/
138-
139-
# Celery stuff
140-
celerybeat-schedule
141-
celerybeat.pid
142-
143-
# SageMath parsed files
144-
*.sage.py
145-
146-
# Environments
147-
.env
148-
.venv
149-
env/
150-
venv/
151-
ENV/
152-
env.bak/
153-
venv.bak/
154-
155-
# Spyder project settings
156-
.spyderproject
157-
.spyproject
158-
159-
# Rope project settings
160-
.ropeproject
161-
162-
# mkdocs documentation
163-
/site
164-
165-
# mypy
166-
.mypy_cache/
167-
.dmypy.json
168-
dmypy.json
169-
170-
# Pyre type checker
171-
.pyre/
172-
173-
# pytype static type analyzer
174-
.pytype/
175-
176-
# Cython debug symbols
177-
cython_debug/
19+
########################
20+
# By Horizon Community #
21+
########################
17822

179-
# PyCharm
180-
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
181-
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
182-
# and can be added to the global gitignore or merged into this file. For a more nuclear
183-
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
184-
#.idea/
18523
data
18624
raw_points.txt
18725
voronoi_edges.txt
@@ -190,3 +28,4 @@ voronoi_edges.txt
19028
load_test.db-journal
19129
/deps
19230
/.cargo
31+
Cargo.lock

‎.vscode/settings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"LineNumberDeco.enableRainbow": false,
33
"CodeGPT.apiKey": "Ollama",
44
"LineNumberDeco.enableRelativeLine": false,
5-
"rust-analyzer.checkOnSave": false
5+
"rust-analyzer.checkOnSave": true
66
}

0 commit comments

Comments
 (0)