Skip to content

Commit

Permalink
remove mage, add makefile (#32)
Browse files Browse the repository at this point in the history
* remove mage, add makefile

* remove depfile
  • Loading branch information
gimmyxd authored Jun 12, 2024
1 parent cada4a7 commit 37981c5
Show file tree
Hide file tree
Showing 9 changed files with 95 additions and 1,107 deletions.
37 changes: 4 additions & 33 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ on:

env:
VAULT_ADDR: https://vault.eng.aserto.com/
GO_VERSION: "1.17"

jobs:
test:
Expand Down Expand Up @@ -59,55 +58,27 @@ jobs:
url: ${{ env.VAULT_ADDR }}
token: ${{ secrets.VAULT_TOKEN }}
secrets: |
kv/data/github "SSH_PRIVATE_KEY" | SSH_PRIVATE_KEY;
kv/data/rubygems "RUBYGEMS_API_KEY" | GEM_HOST_API_KEY;
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: ${{ env.GO_VERSION }}

- name: Setup caching
uses: actions/cache@v4
with:
path: |
~/.cache/go-build
~/go/pkg/mod
.ext
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum', 'Depfile') }}
restore-keys: |
${{ runner.os }}-go-

- name: Install dependencies
run: |
mkdir -p $HOME/.ssh
umask 0077 && echo -e "${SSH_PRIVATE_KEY}" > $HOME/.ssh/id_rsa
ssh-keyscan github.com >> $HOME/.ssh/known_hosts
git config --global url."[email protected]:".insteadOf https://github.com/
git config --global user.email "[email protected]"
git config --global user.name "Aserto Bot"
eval `ssh-agent`
ssh-add $HOME/.ssh/id_rsa
go run mage.go deps
run: make deps

- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.1
ruby-version: 3.3

- name: Build and push the gem
run: go run mage.go release
run: make release

- name: Bump to the next version
run: go run mage.go bump patch
run: make bump-version

- name: Commit changes
uses: EndBug/add-and-commit@v9
Expand Down
5 changes: 0 additions & 5 deletions Depfile

This file was deleted.

2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,6 @@ end
```
## Development
Prerequisites:

- go >= 1.17 to run mage
- Ruby >= 3.0 to run the code


Expand Down
4 changes: 2 additions & 2 deletions aserto.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ Gem::Specification.new do |spec|
spec.metadata["rubygems_mfa_required"] = "true"

# runtime dependencies
spec.add_runtime_dependency "aserto-authorizer", ">= 0.20.2"
spec.add_runtime_dependency "aserto-directory", ">= 0.31.3"
spec.add_runtime_dependency "aserto-authorizer", "~> 0.20", ">= 0.20.2"
spec.add_runtime_dependency "aserto-directory", "~> 0.31", ">= 0.31.4"
spec.add_runtime_dependency "jwt", "~> 2.4"
spec.add_runtime_dependency "rack", ">= 2.0", "< 4.0"
end
48 changes: 0 additions & 48 deletions go.mod

This file was deleted.

Loading

0 comments on commit 37981c5

Please sign in to comment.