Skip to content

Commit ae17023

Browse files
committed
refactor: simplify ci scripts
1 parent 6b81c48 commit ae17023

File tree

8 files changed

+7
-7
lines changed

8 files changed

+7
-7
lines changed

.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,4 @@ task:
7575
cp {README.md,LICENSE-APACHE,LICENSE-MIT} "$staging/"
7676
tar czf "$staging.tar.gz" "$staging"
7777
upload_script: |
78-
./ci/upload_release_file.sh
78+
./scripts/ci/upload_release_file.sh

.github/workflows/devel.docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- trying
99
paths:
1010
- docker/**/Dockerfile
11-
- ci/**/*.sh
11+
- scripts/ci/**/*.sh
1212
env:
1313
DOCKER_IMAGE: localhost:5000/github.com/static-web-server/static-web-server
1414

@@ -78,7 +78,7 @@ jobs:
7878
env:
7979
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8080
run: |
81-
ci/get_latest_release.sh
81+
scripts/ci/get_latest_release.sh
8282
cat /tmp/version >> $GITHUB_ENV
8383
cat /tmp/version
8484
echo "SERVER_DOCKERFILE=./docker/alpine/Dockerfile" >> $GITHUB_ENV

.github/workflows/devel.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ jobs:
144144

145145
- name: Install Linux/BSD tools
146146
if: ${{ !contains(matrix.os, 'windows') }}
147-
run: ci/install-tools.sh --target=${{ matrix.target }}
147+
run: scripts/ci/install_tools.sh --target=${{ matrix.target }}
148148

149149
- name: Install Rust
150150
uses: dtolnay/rust-toolchain@stable
@@ -157,7 +157,7 @@ jobs:
157157
run: |
158158
# Use 'cargo.sh' script for Android targets only
159159
if [[ "${{ matrix.build }}" == "linux-android-armv7" ]] || [[ "${{ matrix.build }}" == "linux-android-arm64" ]]; then
160-
echo "CARGO_BIN=ci/cargo.sh" >> $GITHUB_ENV
160+
echo "CARGO_BIN=scripts/ci/cargo.sh" >> $GITHUB_ENV
161161
else
162162
cargo install cross@^0.2
163163
echo "CARGO_BIN=cross" >> $GITHUB_ENV

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ jobs:
146146

147147
- name: Install Linux/BSD tools
148148
if: ${{ !contains(matrix.os, 'windows') }}
149-
run: ci/install-tools.sh --target=${{ matrix.target }}
149+
run: scripts/ci/install_tools.sh --target=${{ matrix.target }}
150150

151151
- name: Install Rust
152152
uses: dtolnay/rust-toolchain@stable
@@ -160,7 +160,7 @@ jobs:
160160
if [ "${{ matrix.os }}" = "ubuntu-22.04" ]; then
161161
# Use 'cargo.sh' script for Android targets only
162162
if [[ "${{ matrix.build }}" == "linux-android-armv7" ]] || [[ "${{ matrix.build }}" == "linux-android-arm64" ]]; then
163-
echo "CARGO_BIN=ci/cargo.sh" >> $GITHUB_ENV
163+
echo "CARGO_BIN=scripts/ci/cargo.sh" >> $GITHUB_ENV
164164
else
165165
cargo install cross@^0.2
166166
echo "CARGO_BIN=cross" >> $GITHUB_ENV
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)