Skip to content

Commit 7706c6e

Browse files
committed
Release v0.0.1
- Version command - Build for OSX-10.15 and Ubuntu 18LTS - Releases for OSX-10.15 and Ubuntu 18LTS - Remove old Go code and smoke.sh - Pin all rust versions - Update install text and Makefile
1 parent 9b335d9 commit 7706c6e

File tree

385 files changed

+66
-477333
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

385 files changed

+66
-477333
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ env:
77

88
jobs:
99
build:
10-
runs-on: ubuntu-latest
11-
10+
strategy:
11+
matrix:
12+
os: [ubuntu-18.04, macos-10.15]
13+
runs-on: ${{ matrix.os }}
1214
steps:
1315
- uses: actions/checkout@v2
1416
- uses: actions/cache@v2.0.0

.github/workflows/release.yml

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,11 @@ jobs:
2626
with:
2727
name: release-upload-url
2828
path: release-upload-url.txt
29-
build-nix:
30-
runs-on: ubuntu-18.04
29+
artifact:
30+
strategy:
31+
matrix:
32+
os: [ubuntu-18.04, macos-10.15]
33+
runs-on: ${{ matrix.os }}
3134
needs: create
3235
steps:
3336
- name: Checkout code
@@ -36,36 +39,12 @@ jobs:
3639
with:
3740
name: release-upload-url
3841
path: release-upload-url.txt
39-
- id: release_info
40-
run: |
41-
echo ::set-output name=upload_url::$(cat release-upload-url.txt/release-upload-url.txt)
4242
- name: Compile Binary
4343
run: cargo build --release
44-
- name: Upload Release Asset
45-
id: upload-release-asset
46-
uses: actions/upload-release-asset@v1
47-
env:
48-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
49-
with:
50-
upload_url: ${{ steps.release_info.outputs.upload_url }}
51-
asset_path: target/release/scribe
52-
asset_name: scribe-linux
53-
asset_content_type: binary/octet-stream
54-
build-osx:
55-
runs-on: macos-10.15
56-
needs: create
57-
steps:
58-
- name: Checkout code
59-
uses: actions/checkout@v2
60-
- uses: actions/download-artifact@v2
61-
with:
62-
name: release-upload-url
63-
path: release-upload-url.txt
6444
- id: release_info
6545
run: |
46+
echo ::set-output name=release_name::$(./target/release/scribe version)
6647
echo ::set-output name=upload_url::$(cat release-upload-url.txt/release-upload-url.txt)
67-
- name: Compile Binary
68-
run: cargo build --release
6948
- name: Upload Release Asset
7049
id: upload-release-asset
7150
uses: actions/upload-release-asset@v1
@@ -74,5 +53,5 @@ jobs:
7453
with:
7554
upload_url: ${{ steps.release_info.outputs.upload_url }}
7655
asset_path: target/release/scribe
77-
asset_name: scribe-darwin
56+
asset_name: ${{ steps.release_info.outputs.release_name }}
7857
asset_content_type: binary/octet-stream

.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,4 @@
33
# Proprietary
44
# Updated by Brandon Waite, May 28 2020
55

6-
/.tests/
76
/target/
8-
scribe
9-
test.db
10-
debug.log

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[package]
22
name = "scribe"
3-
version = "0.1.0"
3+
version = "0.0.1"
44
authors = ["Brandon Waite"]
55
edition = "2018"
66

77
[dependencies]
8-
termion = "*"
9-
libc = "*"
10-
log = { version = "*", features = ["std"] }
11-
dirs = "*"
12-
rusqlite = { version = "*", features = ["bundled"] }
13-
base64 = "*"
8+
termion = "1.5.5"
9+
libc = "0.2.69"
10+
log = { version = "0.4.8", features = ["std"] }
11+
dirs = "2.0.2"
12+
rusqlite = { version = "0.23.1", features = ["bundled"] }
13+
base64 = "0.11.0"

Makefile

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,15 @@
33
# Proprietary
44
# Updated by Brandon Waite, May 28 2020
55

6-
.PHONY: rust
6+
.PHONY: build
77

8-
install:
9-
go-bindata -o src/data.go -ignore='.*\.(go|rs)$$' src
10-
go build -o /usr/local/bin/scribe src/*.go
8+
build:
9+
cargo build --release
1110

12-
install-tty-debug:
13-
go-bindata -o src/data.go src
14-
go build -o /usr/local/bin/scribe -ldflags "-X main.TTYSleep=400ms" src/*.go
11+
install: build
12+
cp target/release/scribe /usr/local/bin/scribe
13+
scribe version
1514

1615
uninstall:
1716
rm -r ~/.scribe
18-
19-
init:
20-
go install github.com/jteeuwen/go-bindata
21-
go install github.com/mattn/go-sqlite3
22-
23-
rust:
24-
cargo build --release
25-
cp target/release/scribe /usr/local/bin/scribe
17+
rm $(which scribe)

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ I am not asking you to blindly trust a binary touching your shell and recording
2020
### Install
2121

2222
```bash
23-
make init
2423
make install
2524
```
2625

@@ -51,7 +50,7 @@ High level:
5150
- [ ] Signed/Checksumed release binaries
5251
- [ ] GPG Signed commits
5352
- [ ] Reproducable artifacts
54-
- [ ] Linux binaries
55-
- [ ] OSX binaries
53+
- [x] Linux binaries
54+
- [x] OSX binaries
5655
- [ ] Latest build always published
5756
- [ ] `upgrade` subcommand

go.mod

Lines changed: 0 additions & 8 deletions
This file was deleted.

go.sum

Lines changed: 0 additions & 14 deletions
This file was deleted.

smoke.sh

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)