Skip to content

Commit

Permalink
dangling ref (#109)
Browse files Browse the repository at this point in the history
* dangling ref

* deprecated macos-12 actions
  • Loading branch information
PhilipDeegan authored Dec 19, 2024
1 parent 15abf46 commit 2abcae0
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
build:
strategy:
matrix:
os: [macos-12, macos-latest]
os: [macos-14, macos-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand Down
17 changes: 0 additions & 17 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,22 +66,6 @@ jobs:
retention-days: 1


build_x86_macos:
runs-on: macos-12
steps:
- uses: actions/checkout@v4
- run: ./res/ci/nixish_setup.sh && make bsd
- env:
MKN_GCC_PREFERRED: 1
KUL_GIT_CO: --depth 1
run: KLOG=3 ./mkn build -dtKa "-std=c++17 -fPIC" -O 2 -g 0 -W 9 -o mkn_x86_osx
- uses: actions/upload-artifact@v4.4.0
with:
name: maiken-macos-12
path: bin/build/mkn_x86_osx
retention-days: 1


build_arm_macos:
runs-on: macos-latest
steps:
Expand Down Expand Up @@ -117,5 +101,4 @@ jobs:
maiken-windows-latest/mkn.exe
maiken-ubuntu-latest/mkn_nix
maiken-manylinux-latest/mkn_manylinux
maiken-macos-12/mkn_x86_osx
maiken-macos-latest/mkn_arm_osx
2 changes: 1 addition & 1 deletion mkn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
name: mkn
version: master
property:
DATE: 07-OCT-2024
DATE: 19-DEC-2024
maiken_location: ${MKN_HOME}/app/mkn/${version}
maiken_scm: https://github.com/mkn/mkn
self.deps: mkn.kul
Expand Down
2 changes: 1 addition & 1 deletion src/maiken.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ void maiken::Application::setSuper() {
if (project().root()[STR_SUPER]) {
mkn::kul::os::PushDir pushd(project().dir().real());

auto const& super_string = project().root()[STR_SUPER].Scalar();
auto const super_string = project().root()[STR_SUPER].Scalar();
auto const gOrC = [&](auto const& in) {
try {
return &Applications::INSTANCE()
Expand Down
2 changes: 1 addition & 1 deletion src/maiken/build/bin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ void maiken::Application::buildExecutable(mkn::kul::hash::set::String const& obj
KEXIT(1, "Unable to handle artifact: \"" + file + "\" - type is not in file list");
std::string const oType("." + (*AppVars::INSTANCE().envVars().find("MKN_OBJ")).second);
mkn::kul::Dir objD(buildDir().join("obj")), tmpD(buildDir().join("tmp"));
std::string const& name(out.empty() ? project().root()[STR_NAME].Scalar() : out);
auto const name(out.empty() ? project().root()[STR_NAME].Scalar() : out);
auto obFile = Source(mkn::kul::File(main_->in()).real()).object();
mkn::kul::File tbject(obFile, tmpD);
if (!tbject)
Expand Down
2 changes: 1 addition & 1 deletion src/maiken/dep.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ void maiken::Application::buildDepVec(std::string const& depVal) {
for (Application* ap : deps) {
Application& a(*ap);
a.buildDepVecRec(dePs, AppVars::INSTANCE().dependencyLevel(), i, include);
std::string const& name(a.project().root()[STR_NAME].Scalar());
auto const name(a.project().root()[STR_NAME].Scalar());
std::stringstream ss;
ss << name << "[" << (a.p.empty() ? "@" : a.p) << "]";
if (AppVars::INSTANCE().dependencyLevel() || include.count(ss.str())) a.ig = 0;
Expand Down
4 changes: 2 additions & 2 deletions src/maiken/validation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class Validator : public maiken::Constants {
static void PRE_BUILD(maiken::Application const& a, YAML::Node const& n)
KTHROW(maiken::Exception) {
if (n[STR_MODE]) {
auto const& s(n[STR_MODE].Scalar());
auto const s(n[STR_MODE].Scalar());
if (s != STR_NONE && s != STR_STATIC && s != STR_SHARED)
KEXIT(1, "mode tag invalid value, expects none/static/shared\n" + a.project().dir().path());
}
Expand Down Expand Up @@ -130,7 +130,7 @@ void maiken::Application::preSetupValidation() KTHROW(maiken::Exception) {
Validator::PRE_BUILD(*this, project().root());
std::vector<std::string> profiles;
for (auto const& profile : project().root()[STR_PROFILE]) {
std::string const& p(profile[STR_NAME].Scalar());
auto const p(profile[STR_NAME].Scalar());
if (p.find("[") != std::string::npos || p.find("]") != std::string::npos)
KEXIT(1, "Profile may not contain character \"[\" or \"]\"");
if (p == project().root()[STR_NAME].Scalar())
Expand Down

0 comments on commit 2abcae0

Please sign in to comment.