Skip to content

Commit d5c1d8e

Browse files
committed
#575 CI issues, use older ring version & cross
#575 use cross Create backup clone with unique name in deployment Fix binary source Fix CI deploy Fix atomic CI script
1 parent b01b53f commit d5c1d8e

File tree

2 files changed

+9
-16
lines changed

2 files changed

+9
-16
lines changed

.github/workflows/deployment.yml

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ jobs:
77
deploy:
88
runs-on: ubuntu-latest
99
steps:
10-
# I don't want to keep
11-
# https://github.com/atomicdata-dev/atomic-data-rust/issues/230
12-
# - name: install dependencies
13-
# run: sudo apt-get install libgtk-3-dev libsoup2.4
1410
- uses: actions/checkout@v2
1511
- run: openssl version
1612
- uses: actions-rs/toolchain@v1
@@ -19,6 +15,7 @@ jobs:
1915
target: x86_64-unknown-linux-musl
2016
- uses: actions-rs/cargo@v1
2117
with:
18+
use-cross: true
2219
command: build
2320
args: --release --package atomic-server --target x86_64-unknown-linux-musl
2421
- name: Set env
@@ -28,23 +25,19 @@ jobs:
2825
env:
2926
SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
3027
ARGS: "-rltgoDzvO"
31-
SOURCE: "target/release/atomic-server"
28+
SOURCE: "target/x86_64-unknown-linux-musl/release/atomic-server"
3229
REMOTE_HOST: ${{ secrets.REMOTE_HOST }}
3330
REMOTE_USER: ${{ secrets.REMOTE_USER }}
34-
# Set filename to unique ID
35-
# TARGET: ~/atomic-server-${{ env.RELEASE_VERSION }}
3631
TARGET: ~/
37-
# - name: Export data
38-
# run: ~/atomic-server --export
39-
# - name: Run new server
40-
# run: ~/atomic-server &> log-${{ GITHUB_REF#refs/*/ }}
4132
- name: executing remote ssh commands using ssh key
4233
uses: appleboy/ssh-action@master
4334
with:
4435
host: ${{ secrets.REMOTE_HOST }}
4536
username: ${{ secrets.REMOTE_USER }}
4637
key: ${{ secrets.SSH_PRIVATE_KEY }}
47-
# TODO: fix backup, see
48-
# https://github.com/atomicdata-dev/atomic-data-rust/issues/487
49-
# script: systemctl restart atomic && ~/atomic-server export && systemctl restart atomic
50-
script: systemctl stop atomic && ~/atomic-server export &&
38+
script: |
39+
cp ~/atomic-server ~/atomic-server-$(date +'%Y-%m-%dT%H:%M:%S')
40+
systemctl stop atomic
41+
./atomic-server export &&
42+
systemctl start atomic
43+
systemctl status atomic

lib/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ kuchiki = {version = "0.8.1", optional = true}
2424
lol_html = {version = "0.3.1", optional = true}
2525
rand = {version = "0.8"}
2626
regex = "1"
27-
ring = "0.16"
27+
ring = "0.16.19"
2828
rio_api = {version = "0.7", optional = true}
2929
rio_turtle = {version = "0.7", optional = true}
3030
serde = {version = "1", features = ["derive"]}

0 commit comments

Comments
 (0)