add go to PATH
This commit is contained in:
parent
8550f59ee6
commit
7e23d869a8
@ -18,20 +18,42 @@ jobs:
|
|||||||
SSH_AUTH_SOCK: /tmp/ssh.sock
|
SSH_AUTH_SOCK: /tmp/ssh.sock
|
||||||
ENVIRONMENT: dev
|
ENVIRONMENT: dev
|
||||||
volumes:
|
volumes:
|
||||||
- "/etc/timezone:/etc/timezone:ro"
|
|
||||||
- "/etc/localtime:/etc/localtime:ro"
|
|
||||||
- "/etc/gitconfig:/etc/gitconfig:ro"
|
- "/etc/gitconfig:/etc/gitconfig:ro"
|
||||||
- "/${{ env.SSH_AUTH_SOCK }}:/tmp/ssh.sock"
|
|
||||||
- "/opt/gitea/act_runner/.ssh/known_hosts:/root/.ssh/known_hosts"
|
- "/opt/gitea/act_runner/.ssh/known_hosts:/root/.ssh/known_hosts"
|
||||||
- "/opt/gitea/act_runner/.gitconfig:/root/.gitconfig:ro"
|
- "/opt/gitea/act_runner/.gitconfig:/root/.gitconfig:ro"
|
||||||
- "/opt/gitea/act_runner/.git-credentials:/root/.git-credentials:ro"
|
- "/opt/gitea/act_runner/.git-credentials:/root/.git-credentials:ro"
|
||||||
- "/etc/ssl/certs:/etc/ssl/certs:ro"
|
|
||||||
options: --cpus 10
|
options: --cpus 10
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- run: dnf install -y dnf-plugins-core rpm-build rpmdevtools
|
- run: dnf install -y dnf-plugins-core rpm-build rpmdevtools
|
||||||
|
- run: echo "$(pwd)/go/bin" >> $GITHUB_PATH
|
||||||
- run: dnf builddep -y build/jx.spec
|
- run: dnf builddep -y build/jx.spec
|
||||||
- run: make rpm
|
- run: make rpm
|
||||||
- uses: ncipollo/release-action@v1
|
- uses: ncipollo/release-action@v1
|
||||||
with:
|
with:
|
||||||
artifacts: "jx,/root/rpmbuild/**/*.rpm"
|
artifacts: "jx,/root/rpmbuild/**/*.rpm"
|
||||||
|
build-focal:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
container:
|
||||||
|
image: ubuntu:focal
|
||||||
|
env:
|
||||||
|
GOPATH: /
|
||||||
|
SSH_AUTH_SOCK: /tmp/ssh.sock
|
||||||
|
ENVIRONMENT: dev
|
||||||
|
volumes:
|
||||||
|
- "/etc/gitconfig:/etc/gitconfig:ro"
|
||||||
|
- "/opt/gitea/act_runner/.ssh/known_hosts:/root/.ssh/known_hosts"
|
||||||
|
- "/opt/gitea/act_runner/.gitconfig:/root/.gitconfig:ro"
|
||||||
|
- "/opt/gitea/act_runner/.git-credentials:/root/.git-credentials:ro"
|
||||||
|
options: --cpus 10
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v3
|
||||||
|
- run: make build-deps
|
||||||
|
- run: echo "$(pwd)/go/bin" >> $GITHUB_PATH
|
||||||
|
- run: make build
|
||||||
|
- run: make deb
|
||||||
|
- uses: ncipollo/release-action@v1
|
||||||
|
with:
|
||||||
|
artifacts: "jx"
|
||||||
|
@ -78,6 +78,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
- run: dnf install -y dnf-plugins-core rpm-build rpmdevtools
|
- run: dnf install -y dnf-plugins-core rpm-build rpmdevtools
|
||||||
|
- run: echo "$(pwd)/go/bin" >> $GITHUB_PATH
|
||||||
- run: dnf builddep -y build/jx.spec
|
- run: dnf builddep -y build/jx.spec
|
||||||
- name: Run build
|
- name: Run build
|
||||||
run: |
|
run: |
|
||||||
@ -115,6 +116,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
- run: echo "$(pwd)/go/bin" >> $GITHUB_PATH
|
||||||
- run: make ubuntu-deps
|
- run: make ubuntu-deps
|
||||||
- run: make build
|
- run: make build
|
||||||
- run: make deb
|
- run: make deb
|
||||||
|
1
Makefile
1
Makefile
@ -2,7 +2,6 @@ IMAGE?=fedora:latest
|
|||||||
LDFLAGS?=--ldflags '-extldflags "-static"' --ldflags="-X 'main.commit=$(shell git rev-parse HEAD)' -X 'main.version=$(shell git describe --tags)' -X 'main.date=$(shell date '+%Y-%m-%d %T.%s%z')'"
|
LDFLAGS?=--ldflags '-extldflags "-static"' --ldflags="-X 'main.commit=$(shell git rev-parse HEAD)' -X 'main.version=$(shell git describe --tags)' -X 'main.date=$(shell date '+%Y-%m-%d %T.%s%z')'"
|
||||||
export CGO_ENABLED=1
|
export CGO_ENABLED=1
|
||||||
VERSION?=$(shell git describe --tags | sed -e 's/^v//' -e 's/-/_/g')
|
VERSION?=$(shell git describe --tags | sed -e 's/^v//' -e 's/-/_/g')
|
||||||
export PATH=$(PATH):$(shell pwd)/go/bin
|
|
||||||
.PHONY=jx-cli
|
.PHONY=jx-cli
|
||||||
|
|
||||||
build: jx-cli
|
build: jx-cli
|
||||||
|
Loading…
Reference in New Issue
Block a user