Skip to content

Commit af07f49

Browse files
authored
Merge pull request #9 from aserto-dev/remove_mage
remove mage, add makefile
2 parents a3021ee + 0aaa374 commit af07f49

8 files changed

Lines changed: 98 additions & 1110 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 9 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ on:
1313

1414
env:
1515
VAULT_ADDR: https://vault.eng.aserto.com/
16-
GO_VERSION: "1.19"
1716
RAILS_ENV: test
1817

1918
jobs:
@@ -22,14 +21,14 @@ jobs:
2221
runs-on: ubuntu-latest
2322

2423
steps:
25-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v4
2625
with:
2726
fetch-depth: 0
2827

2928
- name: Setup Ruby
3029
uses: ruby/setup-ruby@v1
3130
with:
32-
ruby-version: 3.1
31+
ruby-version: 3.3
3332
bundler-cache: true
3433

3534
- name: Run linter
@@ -61,7 +60,7 @@ jobs:
6160
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
6261

6362
steps:
64-
- uses: actions/checkout@v3
63+
- uses: actions/checkout@v4
6564
with:
6665
fetch-depth: 0
6766

@@ -83,61 +82,32 @@ jobs:
8382
name: Release to rubygems
8483
steps:
8584
- name: Read Configuration
86-
uses: hashicorp/vault-action@v2.4.1
85+
uses: hashicorp/vault-action@v3
8786
id: vault
8887
with:
8988
url: ${{ env.VAULT_ADDR }}
9089
token: ${{ secrets.VAULT_TOKEN }}
9190
secrets: |
92-
kv/data/github "SSH_PRIVATE_KEY" | SSH_PRIVATE_KEY;
9391
kv/data/rubygems "RUBYGEMS_API_KEY" | GEM_HOST_API_KEY;
9492
9593
- name: Checkout
96-
uses: actions/checkout@v3
94+
uses: actions/checkout@v4
9795
with:
9896
fetch-depth: 0
9997

100-
- name: Setup Go
101-
uses: actions/setup-go@v2
102-
with:
103-
go-version: ${{ env.GO_VERSION }}
104-
105-
- name: Setup caching
106-
uses: actions/cache@v2
107-
with:
108-
path: |
109-
~/.cache/go-build
110-
~/go/pkg/mod
111-
.ext
112-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum', 'Depfile') }}
113-
restore-keys: |
114-
${{ runner.os }}-go-
115-
11698
- name: Install dependencies
117-
run: |
118-
mkdir -p $HOME/.ssh
119-
umask 0077 && echo -e "${SSH_PRIVATE_KEY}" > $HOME/.ssh/id_rsa
120-
ssh-keyscan github.com >> $HOME/.ssh/known_hosts
121-
122-
git config --global url."git@github.com:".insteadOf https://github.com/
123-
git config --global user.email "github-bot@aserto.com"
124-
git config --global user.name "Aserto Bot"
125-
126-
eval `ssh-agent`
127-
ssh-add $HOME/.ssh/id_rsa
128-
129-
go run mage.go deps
99+
run: make deps
130100

131101
- name: Set up Ruby
132102
uses: ruby/setup-ruby@v1
133103
with:
134-
ruby-version: 3.1
104+
ruby-version: 3.3
135105

136106
- name: Build and push the gem
137-
run: go run mage.go release
107+
run: make release
138108

139109
- name: Bump to the next version
140-
run: go run mage.go bump patch
110+
run: make bump-version
141111

142112
- name: Commit changes
143113
uses: EndBug/add-and-commit@v9

Depfile

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

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,6 @@ The current user's permissions can then be checked using the `allowed?`, `visibl
213213

214214
## Development
215215
Prerequisites:
216-
217-
- go >= 1.17 to run mage
218216
- Ruby >= 3.0 to run the code
219217

220218

go.mod

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

0 commit comments

Comments
 (0)