Skip to content

Commit

Permalink
Moves /scripts/ to /run/rp/
Browse files Browse the repository at this point in the history
  • Loading branch information
hoijui committed Jan 20, 2025
1 parent 044b6f3 commit a6a894f
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2021 - 2024 Robin Vobruba <[email protected]>
# SPDX-FileCopyrightText: 2021 - 2025 Robin Vobruba <[email protected]>
#
# SPDX-License-Identifier: Unlicense

Expand All @@ -12,7 +12,7 @@ on:
- 'tests/**'
- 'Cargo.toml'
- 'Cargo.lock'
- 'scripts/build'
- 'run/rp/build'
- '.github/workflows/build.yml'
release:
types: [ published ]
Expand All @@ -35,7 +35,7 @@ jobs:
submodules: true

- name: "Install STOML (BASH TOML parser)"
run: scripts/install_stoml
run: run/rp/install_stoml

- name: "Setup Python 3"
uses: actions/setup-python@v4
Expand Down Expand Up @@ -63,11 +63,11 @@ jobs:
uses: Swatinem/rust-cache@v2

- name: "Install STOML (BASH TOML parser) *again*, because the cache recreation above might have removed it"
run: scripts/install_stoml
run: run/rp/install_stoml

- name: "Build"
run: scripts/build
run: run/rp/build

- name: "Test & Check"
run: scripts/test
run: run/rp/test

18 changes: 9 additions & 9 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2021 - 2024 Robin Vobruba <[email protected]>
# SPDX-FileCopyrightText: 2021 - 2025 Robin Vobruba <[email protected]>
#
# SPDX-License-Identifier: Unlicense

Expand Down Expand Up @@ -50,12 +50,12 @@ jobs:
submodules: true

- name: "Install STOML (BASH TOML parser)"
run: scripts/install_stoml
run: run/rp/install_stoml

- name: Set the environment variables (including OUR_VERSION)
shell: bash
if: env.OUR_VERSION == ''
run: scripts/env
run: run/rp/env

- name: Create GitHub release
id: release
Expand Down Expand Up @@ -113,17 +113,17 @@ jobs:

- name: "Install STOML (BASH TOML parser)"
run: |
scripts/install_stoml
run/rp/install_stoml
- name: Set the environment variables (including OUR_VERSION)
shell: bash
if: env.OUR_VERSION == ''
run: scripts/env
run: run/rp/env

- name: Install packages (Ubuntu)
if: matrix.os == 'ubuntu-latest'
run: |
scripts/install_deps_ubuntu
run/rp/install_deps_ubuntu
# - name: Install packages (macOS)
# if: matrix.os == 'macos-latest'
Expand Down Expand Up @@ -151,7 +151,7 @@ jobs:
echo "target dir is: ${{ env.TARGET_DIR }}"
- name: Build and strip release binary
run: scripts/build --skip-strip
run: run/rp/build --skip-strip

# - name: Strip release binary (linux and macos)
# if: matrix.build == 'linux' || matrix.build == 'macos'
Expand All @@ -171,7 +171,7 @@ jobs:
run: |
export ENV_FILE="proj_build_envs.txt"
# This writes "BINARY=bla" to ENV_FILE
scripts/env
run/rp/env
source "$ENV_FILE"
BIN="target/release/$BINARY"
if [ -f "$BIN" ]
Expand All @@ -197,7 +197,7 @@ jobs:
- name: Build archive
shell: bash
run: |
scripts/package
run/rp/package
- name: Upload release archive
uses: actions/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
# SPDX-License-Identifier: Unlicense

[submodule "scripts"]
path = scripts
path = run/rp
url = https://github.com/hoijui/rust-project-scripts.git
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# KiCad text injector

<!--
SPDX-FileCopyrightText: 2021-2023 Robin Vobruba <[email protected]>
SPDX-FileCopyrightText: 2021-2025 Robin Vobruba <[email protected]>
SPDX-License-Identifier: CC0-1.0
-->
Expand Down Expand Up @@ -50,7 +50,7 @@ You need to install Rust(lang) and Cargo.
Then you can run:

```bash
scripts/build
run/rp/build
```

## Get the tool
Expand Down
Submodule rp updated from 000000 to 51a9c6

0 comments on commit a6a894f

Please sign in to comment.