Skip to content

Commit

Permalink
Merge branch 'main' into release-lts-1
Browse files Browse the repository at this point in the history
this discards the "downgrade back to go 1.22" (that never existed in main)
and pulls the memleak fixes from mvdan
  • Loading branch information
altergui committed Dec 18, 2024
2 parents e7a8277 + 2b98a4c commit e09aebb
Show file tree
Hide file tree
Showing 77 changed files with 2,622 additions and 1,647 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Set up Go environment
uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
- name: Tidy go module
run: |
go mod tidy
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
- uses: benjlevesque/short-sha@v3.0 # sets env.SHA to the first 7 chars of github.sha
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
- run: mkdir -p "$PWD/gocoverage-unit/"
- name: Run Go test -race
id: go-test-race
Expand Down Expand Up @@ -151,7 +151,7 @@ jobs:
- uses: actions/download-artifact@v4
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
cache: false
- name: Convert gocoverage format
run: |
Expand Down Expand Up @@ -190,7 +190,7 @@ jobs:
name: gocoverage-all-textfmt@${{ env.SHA }}
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
cache: false
- name: Send coverage to coveralls.io (unit)
if: ${{ always() }}
Expand Down
250 changes: 0 additions & 250 deletions .github/workflows/scan_vulns_deps.yml

This file was deleted.

56 changes: 36 additions & 20 deletions .github/workflows/swagger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,16 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v4
- uses: benjlevesque/short-sha@v3.0 # sets env.SHA to the first 7 chars of github.sha
- name: Checkout developer-portal repo
uses: actions/checkout@v4
with:
repository: vocdoni/developer-portal
ref: main
path: developer-portal
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
cache: false
- name: Install swag
run: |
Expand All @@ -33,37 +40,46 @@ jobs:
with:
cmd: |
yq '.components.schemas."api.GenericTransactionWithInfo".properties.tx = load("api/docs/models/transactions.yaml").target' \
api/docs/oas3.yaml > api/docs/vocdoni-api.yaml
api/docs/oas3.yaml > developer-portal/swaggers/vocdoni-api.yaml
- name: Publish Artifact
uses: actions/upload-artifact@v4
with:
name: vocdoni-api.yaml
path: api/docs/vocdoni-api.yaml
path: developer-portal/swaggers/vocdoni-api.yaml

developer-portal-pr:
name: Open PR to developer-portal repo
runs-on: ubuntu-latest
if: ${{ github.event_name != 'pull_request' }}
needs: api-swagger
steps:
- name: Checkout developer-portal repo
uses: actions/checkout@v4
- name: Check if there is a difference
uses: mathiasvr/command-output@v2.0.0
id: diff
with:
repository: vocdoni/developer-portal
ref: main
- name: Remove old yaml
run: rm swaggers/vocdoni-api.yaml
- name: Pull new yaml
uses: actions/download-artifact@v4
run: git -C developer-portal diff --no-color swaggers/vocdoni-api.yaml

- name: Mark previous comment as outdated if no diff
if: ${{ github.event_name == 'pull_request' && steps.diff.outputs.stdout == '' }}
uses: marocchino/sticky-pull-request-comment@v2
with:
name: vocdoni-api.yaml
path: swaggers
header: diff
hide: true
hide_classify: "OUTDATED"

- name: Post comment with diff in original PR
if: ${{ github.event_name == 'pull_request' && steps.diff.outputs.stdout }}
uses: marocchino/sticky-pull-request-comment@v2
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
header: diff
message: |
This PR introduces the following changes in the developer-portal documentation:
```diff
${{ steps.diff.outputs.stdout }}
```
- uses: benjlevesque/short-sha@v3.0 # sets env.SHA to the first 7 chars of github.sha
- name: Create PR to developer-portal repo
id: cpr
uses: peter-evans/create-pull-request@v6
if: ${{ github.event_name == 'push' }}
with:
path: developer-portal
token: ${{ secrets.VOCDONIBOT_PAT }}
commit-message: "Update vocdoni-api docs by commit ${{ env.SHA }}"
committer: "Arabot-1 <arabot-1@users.noreply.github.com>"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:experimental

FROM golang:1.22 AS builder
FROM golang:1.23 AS builder

ARG BUILDARGS

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ To run a Vocdoni-node as a gateway, it's recommended to have at least 4 GiB of R

#### Compile and run

Compile from source in a golang environment (Go>1.22 required):
Compile from source in a golang environment (Go>1.23 required):

```bash
git clone https://github.com/vocdoni/vocdoni-node.git -b release-lts-1
Expand Down
Loading

0 comments on commit e09aebb

Please sign in to comment.