Skip to content

Commit e2b3a31

Browse files
update
1 parent 3b8b9d9 commit e2b3a31

File tree

2 files changed

+33
-19
lines changed

2 files changed

+33
-19
lines changed

.github/workflows/build.yml

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Set Build Tag
3030
id: set_tag
3131
run: |
32-
export TAG="v$(date +'%Y%m%d-%H%M')"
32+
TAG="v$(date +'%Y%m%d-%H%M')"
3333
echo "TAG_NAME=$TAG" >> $GITHUB_ENV
3434
echo "tag_name=$TAG" >> $GITHUB_OUTPUT
3535
@@ -40,38 +40,43 @@ jobs:
4040
4141
- name: Create Git Tag
4242
run: |
43-
git tag $TAG_NAME
44-
git push origin $TAG_NAME
43+
git tag "$TAG_NAME"
44+
git push origin "$TAG_NAME"
4545
46-
- name: Make Script Executable
46+
- name: Make Scripts Executable
4747
run: |
4848
chmod +x ./build_adventurecoin_ubuntu.sh
4949
chmod +x ./build_adventurecoin_mac.sh
5050
51+
# Ubuntu specific steps
5152
- name: Install Dependencies (Ubuntu)
52-
if: inputs.os_target == 'ubuntu'
53-
run: sudo apt-get update && sudo apt-get install -y imagemagick
53+
if: ${{ inputs.os_target == 'ubuntu' }}
54+
run: |
55+
sudo apt-get update
56+
sudo apt-get install -y imagemagick
5457
55-
- name: Run Ubuntu Build
56-
if: inputs.os_target == 'ubuntu'
58+
- name: Run Ubuntu Build Script
59+
if: ${{ inputs.os_target == 'ubuntu' }}
5760
run: |
5861
echo -e "2\ny\ny\ny\ny\ny" | ./build_adventurecoin_ubuntu.sh
5962
60-
- name: Remove conflicting Protobuf versions (macOS)
61-
if: inputs.os_target == 'macos'
63+
# macOS specific steps
64+
- name: Uninstall Protobuf (macOS clean slate)
65+
if: ${{ inputs.os_target == 'macos' }}
6266
run: |
6367
brew uninstall --ignore-dependencies protobuf || true
64-
brew cleanup
68+
brew cleanup || true
6569
66-
- name: Run macOS Build
67-
if: inputs.os_target == 'macos'
70+
- name: Run macOS Build Script
71+
if: ${{ inputs.os_target == 'macos' }}
6872
env:
69-
PATH: "$HOME/local/protobuf-3.6.1/bin:/usr/local/bin:/opt/homebrew/bin:${{ env.PATH }}"
70-
PKG_CONFIG_PATH: "$HOME/local/protobuf-3.6.1/lib/pkgconfig"
71-
LD_LIBRARY_PATH: "$HOME/local/protobuf-3.6.1/lib"
72-
LDFLAGS: "-L$HOME/local/protobuf-3.6.1/lib"
73-
CPPFLAGS: "-I$HOME/local/protobuf-3.6.1/include"
74-
PROTOC: "$HOME/local/protobuf-3.6.1/bin/protoc"
73+
HOME: ${{ github.workspace }}
74+
PATH: "${{ github.workspace }}/local/protobuf-3.6.1/bin:/usr/local/bin:/opt/homebrew/bin:${{ env.PATH }}"
75+
PKG_CONFIG_PATH: "${{ github.workspace }}/local/protobuf-3.6.1/lib/pkgconfig"
76+
LD_LIBRARY_PATH: "${{ github.workspace }}/local/protobuf-3.6.1/lib"
77+
LDFLAGS: "-L${{ github.workspace }}/local/protobuf-3.6.1/lib"
78+
CPPFLAGS: "-I${{ github.workspace }}/local/protobuf-3.6.1/include"
79+
PROTOC: "${{ github.workspace }}/local/protobuf-3.6.1/bin/protoc"
7580
run: |
7681
echo -e "2\ny\ny" | ./build_adventurecoin_mac.sh
7782

build_adventurecoin_mac.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22

33
set -e
44

5+
# --------------------------------
6+
# Ensure $HOME is defined properly
7+
# --------------------------------
8+
if [[ ! "$HOME" =~ ^/ ]]; then
9+
echo -e "${RED}⚠ Detected invalid \$HOME: '$HOME'. Fixing...${RESET}"
10+
export HOME="$(eval echo ~$USER)"
11+
echo -e "${GREEN}✔ HOME corrected to: $HOME${RESET}"
12+
fi
13+
514
# Fix PATH so basic commands are found
615
export PATH="/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:$PATH"
716

0 commit comments

Comments
 (0)