Skip to content

Fix wrong gitVersion info and github action failed on arm #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ti-chi-bot merged 2 commits into from
Aug 17, 2022
Merged

Fix wrong gitVersion info and github action failed on arm #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4c30fb
Fix some minor bugs
cwen0 Aug 17, 2022
36331e3
add some comments
cwen0 Aug 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions .github/workflows/release_latest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,10 @@ jobs:
- name: Prepare build environment
run: |
# actions/checkout require git v2.X
if [ "${{ matrix.arch }}" == "amd64" ]; then
yum -y install https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm
fi
yum install -y gcc
yum install -y make
yum install -y binutils
yum install -y git
yum install -y gcc make binutils centos-release-scl
yum install -y rh-git227-git
echo /opt/rh/rh-git227/root/usr/bin >> $GITHUB_PATH
echo "LD_LIBRARY_PATH=/opt/rh/httpd24/root/usr/lib64:$LD_LIBRARY_PATH" >> $GITHUB_ENV

- uses: actions/checkout@master
with:
Expand Down
23 changes: 13 additions & 10 deletions .github/workflows/release_tag.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@ on:
jobs:
run:
name: Upload
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
arch: [amd64, arm64]
runs-on: ${{ fromJson('{"amd64":"ubuntu-latest", "arm64":["self-hosted", "Linux", "ARM64"]}')[matrix.arch] }}
# glibc version 2.17
container: docker.io/centos:7.2.1511
container: ${{ fromJson('{"amd64":"docker.io/centos:7.2.1511", "arm64":"docker.io/centos:centos7"}')[matrix.arch] }}
steps:
- name: Set up Go 1.18
uses: actions/setup-go@v1
Expand All @@ -19,11 +23,10 @@ jobs:
- name: Prepare build environment
run: |
# actions/checkout require git v2.X
yum -y install https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm
yum install -y gcc
yum install -y make
yum install -y binutils
yum install -y git
yum install -y gcc make binutils centos-release-scl
yum install -y rh-git227-git
echo /opt/rh/rh-git227/root/usr/bin >> $GITHUB_PATH
echo "LD_LIBRARY_PATH=/opt/rh/httpd24/root/usr/lib64:$LD_LIBRARY_PATH" >> $GITHUB_ENV

- uses: actions/checkout@master
with:
Expand All @@ -45,6 +48,6 @@ jobs:
- name: Upload files
run: |
GIT_TAG=${GITHUB_REF##*/}
mv bin chaosd-${GIT_TAG}-linux-amd64
tar czvf chaosd-${GIT_TAG}-linux-amd64.tar.gz chaosd-${GIT_TAG}-linux-amd64
aws s3 cp chaosd-${GIT_TAG}-linux-amd64.tar.gz ${{ secrets.AWS_BUCKET_NAME }}/chaosd-${GIT_TAG}-linux-amd64.tar.gz
mv bin chaosd-${GIT_TAG}-linux-${{ matrix.arch }}
tar czvf chaosd-${GIT_TAG}-linux-${{ matrix.arch }}.tar.gz chaosd-${GIT_TAG}-linux-${{ matrix.arch }}
aws s3 cp chaosd-${GIT_TAG}-linux-${{ matrix.arch }}.tar.gz ${{ secrets.AWS_BUCKET_NAME }}/chaosd-${GIT_TAG}-linux-${{ matrix.arch }}.tar.gz