mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-29 08:08:49 +01:00
Bumps rust-g to `3.0.0` (#76663) ## About The Pull Request You can read more about what's introduced in the last four versions here: https://github.com/tgstation/rust-g/releases The immediate effects for us are as follows: Closes #76549 Closes #76514 Closes #76502 Closes #76490 Closes #76398 Closes #76798 Closes #76921 Closes #76934 Closes #76950 the updates to install rust_g.sh were to cut down on the copypasta code and prevent desyncs. 🆑 code: The currently operating rust-g version on a live server is posted to places like the runtime.log, in the same place where the revision information and any applicable test merges already were. /🆑 Co-authored-by: san7890 <the@san7890.com>
This commit is contained in:
@@ -30,9 +30,6 @@ jobs:
|
||||
- name: Install rust-g
|
||||
if: steps.secrets_set.outputs.SECRETS_ENABLED
|
||||
run: |
|
||||
sudo dpkg --add-architecture i386
|
||||
sudo apt update || true
|
||||
sudo apt install -o APT::Immediate-Configure=false libssl1.1:i386
|
||||
bash tools/ci/install_rust_g.sh
|
||||
- name: Compile and generate Autowiki files
|
||||
if: steps.secrets_set.outputs.SECRETS_ENABLED
|
||||
|
||||
@@ -18,7 +18,7 @@ on:
|
||||
type: string
|
||||
jobs:
|
||||
run_integration_tests:
|
||||
runs-on: ubuntu-20.04
|
||||
runs-on: ubuntu-latest
|
||||
services:
|
||||
mysql:
|
||||
image: mysql:latest
|
||||
@@ -43,9 +43,6 @@ jobs:
|
||||
mysql -u root -proot tg_ci_prefixed < SQL/tgstation_schema_prefixed.sql
|
||||
- name: Install rust-g
|
||||
run: |
|
||||
sudo dpkg --add-architecture i386
|
||||
sudo apt update || true
|
||||
sudo apt install -o APT::Immediate-Configure=false libssl1.1:i386
|
||||
bash tools/ci/install_rust_g.sh
|
||||
- name: Install auxlua
|
||||
run: |
|
||||
|
||||
@@ -110,6 +110,12 @@
|
||||
#define rustg_dmi_strip_metadata(fname) RUSTG_CALL(RUST_G, "dmi_strip_metadata")(fname)
|
||||
#define rustg_dmi_create_png(path, width, height, data) RUSTG_CALL(RUST_G, "dmi_create_png")(path, width, height, data)
|
||||
#define rustg_dmi_resize_png(path, width, height, resizetype) RUSTG_CALL(RUST_G, "dmi_resize_png")(path, width, height, resizetype)
|
||||
/**
|
||||
* input: must be a path, not an /icon; you have to do your own handling if it is one, as icon objects can't be directly passed to rustg.
|
||||
*
|
||||
* output: json_encode'd list. json_decode to get a flat list with icon states in the order they're in inside the .dmi
|
||||
*/
|
||||
#define rustg_dmi_icon_states(fname) RUSTG_CALL(RUST_G, "dmi_icon_states")(fname)
|
||||
|
||||
#define rustg_file_read(fname) RUSTG_CALL(RUST_G, "file_read")(fname)
|
||||
#define rustg_file_exists(fname) RUSTG_CALL(RUST_G, "file_exists")(fname)
|
||||
@@ -158,8 +164,9 @@
|
||||
#define rustg_time_milliseconds(id) text2num(RUSTG_CALL(RUST_G, "time_milliseconds")(id))
|
||||
#define rustg_time_reset(id) RUSTG_CALL(RUST_G, "time_reset")(id)
|
||||
|
||||
/// Returns the timestamp as a string
|
||||
/proc/rustg_unix_timestamp()
|
||||
return text2num(RUSTG_CALL(RUST_G, "unix_timestamp")())
|
||||
return RUSTG_CALL(RUST_G, "unix_timestamp")()
|
||||
|
||||
#define rustg_raw_read_toml_file(path) json_decode(RUSTG_CALL(RUST_G, "toml_file_to_json")(path) || "null")
|
||||
|
||||
|
||||
@@ -37,6 +37,8 @@
|
||||
else if(!originmastercommit)
|
||||
msg += "No commit information"
|
||||
|
||||
msg += "Running rust-g version [rustg_get_version()]"
|
||||
|
||||
return msg.Join("\n")
|
||||
|
||||
/datum/getrev/proc/GetTestMergeInfo(header = TRUE)
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@ export BYOND_MAJOR=514
|
||||
export BYOND_MINOR=1588
|
||||
|
||||
#rust_g git tag
|
||||
export RUST_G_VERSION=1.2.0
|
||||
export RUST_G_VERSION=3.0.0
|
||||
|
||||
#node version
|
||||
export NODE_VERSION=14
|
||||
|
||||
@@ -12,6 +12,7 @@ cd "$1"
|
||||
. dependencies.sh
|
||||
cd "$original_dir"
|
||||
|
||||
|
||||
# update rust-g
|
||||
if [ ! -d "rust-g" ]; then
|
||||
echo "Cloning rust-g..."
|
||||
|
||||
Reference in New Issue
Block a user