Skip to content

Commit

Permalink
Merge branch 'master' into mamcx/identity-hex
Browse files Browse the repository at this point in the history
Signed-off-by: Mario Montoya <mamcx@elmalabarista.com>
  • Loading branch information
mamcx authored Nov 29, 2023
2 parents 36dfbdf + 7b53b85 commit 03349fa
Show file tree
Hide file tree
Showing 151 changed files with 7,684 additions and 4,724 deletions.
11 changes: 4 additions & 7 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
# Description of Changes

Please describe your change, mention any related tickets, and so on here.

# API and ABI
# API and ABI breaking changes

- [ ] This is a breaking change to the module ABI
- [ ] This is a breaking change to the module API
- [ ] This is a breaking change to the ClientAPI
- [ ] This is a breaking change to the SDK API

*If the API is breaking, please state below what will break*
If this is an API or ABI breaking change, please apply the
corresponding GitHub label.

# Expected complexity level and risk

Expand Down
40 changes: 0 additions & 40 deletions .github/scripts/checkMembership.mjs

This file was deleted.

20 changes: 7 additions & 13 deletions .github/workflows/contributor_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,14 @@ jobs:
name: Contributor Membership Check
runs-on: spacetimedb-runner
steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Set up Node.js
uses: actions/setup-node@v2
with:
node-version: '16'

- name: Install dependencies
run: |
npm install @octokit/rest @actions/core @actions/github node-fetch
- name: Verify author is contributor
run: node .github/scripts/checkMembership.mjs
env:
GITHUB_TOKEN: ${{ secrets.ORG_READ_TOKEN }}
CONTRIB_ORG: clockworklabs
PR_AUTHOR: ${{ github.event.pull_request.user.login }}
run: |
if [[ $(gh api --paginate /orgs/$CONTRIB_ORG/members --jq 'any(.login == env.PR_AUTHOR)') != true ]]; then
echo "::error::$PR_AUTHOR is not a member of the organization"
exit 1
fi
6 changes: 4 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ jobs:
type=ref,event=branch,prefix=branch-
type=sha,prefix=commit-
type=ref,event=tag
type=raw,value=latest,enable=false
flavor: |
latest=false
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Cache Docker layers
Expand Down Expand Up @@ -79,7 +80,8 @@ jobs:
type=ref,event=branch,prefix=branch-
type=sha,prefix=commit-
type=ref,event=tag
type=raw,value=latest,enable=false
flavor: |
latest=false
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Cache Docker layers
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/linux-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
- '**'
branches:
- master
- release/*

jobs:
linux-amd64-cli:
Expand All @@ -20,7 +21,7 @@ jobs:
export PATH=$HOME/.cargo/bin:$PATH
cargo build --release -p spacetimedb-cli
mkdir build
mv target/release/spacetime build/spacetime
cp --sparse=never target/release/spacetime build/spacetime
cd build && tar -czf spacetime.linux-amd64.tar.gz spacetime
rm spacetime
Expand Down Expand Up @@ -51,7 +52,7 @@ jobs:
export PATH=$HOME/.cargo/bin:$PATH
cargo build --release -p spacetimedb-cli
mkdir build
mv target/release/spacetime build/spacetime
cp --sparse=never target/release/spacetime build/spacetime
cd build && tar -czf spacetime.linux-arm64.tar.gz spacetime
rm spacetime
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/macos-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
- '**'
branches:
- master
- release/*

jobs:
macos-cli:
Expand All @@ -23,14 +24,14 @@ jobs:
run: |
cargo build --release -p spacetimedb-cli
mkdir build
mv target/release/spacetime build/spacetime
dd if=target/release/spacetime of=build/spacetime conv=noerror,sync
cd build && tar -czf spacetime.darwin-amd64.tar.gz spacetime
rm spacetime
- name: Compile Aarch64
run: |
cargo build --release -p spacetimedb-cli --target=aarch64-apple-darwin
mv target/aarch64-apple-darwin/release/spacetime build/spacetime
dd if=target/aarch64-apple-darwin/release/spacetime of=build/spacetime conv=noerror,sync
cd build && tar -czf spacetime.darwin-arm64.tar.gz spacetime
rm spacetime
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/windows-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
- '**'
branches:
- master
- release/*

jobs:
windows-cli:
Expand Down
Loading

0 comments on commit 03349fa

Please sign in to comment.