Skip to content

Commit

Permalink
Merge pull request #1 from PLEBNET-PLAYGROUND/1682865173/153647c/ccf2…
Browse files Browse the repository at this point in the history
…4de-make-act-rs-relay

make: act-rs-relay: initial config & local build working
  • Loading branch information
RandyMcMillan authored Apr 30, 2023
2 parents 153647c + 0f91844 commit f5a501d
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 6 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: plebnet-playground-nostr-rs-relay
name: rs-relay

# Controls when the action will run.
on:
Expand Down Expand Up @@ -31,10 +31,11 @@ jobs:
name: github-workspace
strategy:
matrix:
os: [ubuntu-20.04, ubuntu-latest]
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: styfle/[email protected]
if: ${{ !env.ACT }}
with:
access_token: ${{ github.token }}
- name: Print github workspace
Expand All @@ -44,10 +45,11 @@ jobs:
latest-build_and_test:
strategy:
matrix:
os: [ ubuntu-latest, ubuntu-22.04 ]
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: styfle/[email protected]
if: ${{ !env.ACT }}
with:
access_token: ${{ github.token }}
- uses: actions/checkout@v2
Expand All @@ -62,18 +64,25 @@ jobs:

- name: make cargo-build/install
run: |
make cargo-build
make cargo-install
export RUSTUP_INIT_SKIP_PATH_CHECK=yes
curl https://sh.rustup.rs -sSf | sh -s -- -y
source "$HOME/.cargo/env" && cargo b && cargo install --path .
#make cargo-build
#make cargo-install
macos-latest-cargo:
if: ${{ !env.ACT }}
strategy:
matrix:
os: [ macos-latest ]
runs-on: ${{ matrix.os }}
steps:
- uses: styfle/[email protected]
if: ${{ !env.ACT }}
with:
access_token: ${{ github.token }}
- uses: actions/checkout@v2
if: ${{ !env.ACT }}
- uses: actions/setup-python@v2
- uses: syphar/restore-virtualenv@v1
id: cache-virtualenv
Expand All @@ -84,6 +93,11 @@ jobs:
if: steps.cache-virtualenv.outputs.cache-hit != 'true'

- name: make cargo-build/install
if: ${{ !env.ACT }}
run: |
export RUSTUP_INIT_SKIP_PATH_CHECK=yes
curl https://sh.rustup.rs -sSf | sh -s -- -y
source $HOME/.cargo/env
make submodules
make cargo-build
make cargo-install
1 change: 1 addition & 0 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -112,5 +112,6 @@ run:## run
restart:## restart
@docker-compose restart
-include cargo.mk
-include act.mk
# vim: set noexpandtab:
# vim: set setfiletype make
2 changes: 2 additions & 0 deletions act.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
act-rs-relay:## run act -vr -W .github/workflows/rs-relay.yml
@pushd $(PWD) && export $(cat ~/GH_TOKEN.txt) && act -vr -W .github/workflows/rs-relay.yml && popd

0 comments on commit f5a501d

Please sign in to comment.