Time |
Nick |
Message |
03:50 |
|
gsams joined #evergreen |
07:13 |
|
45PAAR3XR joined #evergreen |
07:13 |
|
timlaptop joined #evergreen |
07:39 |
|
rjackson-isl joined #evergreen |
08:07 |
|
Dyrcona joined #evergreen |
08:10 |
|
jboyer-isl joined #evergreen |
08:24 |
csharp |
dbwells: I'm interested in 2.5.1... are you awaiting testing feedback that it works? I'm willing to do a test install if that helps |
08:25 |
csharp |
specifically, I'd like to branch off of rel_2_5_1 via git when that gets created |
08:26 |
|
akilsdonk joined #evergreen |
08:27 |
Dyrcona |
csharp: You could just branch off of rel_2_5 now and then change the upstream when 2_5_1 is created. Anything destined for 2_5_1 should go into 2_5. |
08:28 |
Dyrcona |
Which reminds me that we're doing a test upgrade on my development server today before this weekend's update. |
08:29 |
Dyrcona |
As a general recommendation, if you have local changes and you want to track the release branches, I'd suggest basing your local branch off of rel_X_Y and not rel_X_Y_Z anyway. |
08:30 |
csharp |
actually, that's a great idea |
08:30 |
csharp |
it won't matter as much once we lock in on our go-live version, but during this test phase that's better |
08:31 |
Dyrcona |
If you follow rel_X_Y you should pickup anything destined for rel_X_Y_Z, and you'll always be up to date as of your build. |
08:33 |
Dyrcona |
git++ |
08:34 |
* Dyrcona |
checks if yesterday's database reload was successful. |
08:35 |
Dyrcona |
Looks like it was. |
08:36 |
Dyrcona |
csharp: If you're going to build from git, I wouldn't focus on versions. I'd put the focus on branches instead. |
08:39 |
|
Shae joined #evergreen |
08:39 |
csharp |
what we end up doing is putting our customizations in a git branch, then tarring up the differing files that then get clobbered onto the unzipped tarball during our deb-building process |
08:39 |
csharp |
we then install from those debs, so they do get "frozen" into whatever version it is |
08:40 |
csharp |
that makes piecemeal upgrades a pain, but installation/administration is *so* much easier |
08:43 |
|
ningalls joined #evergreen |
08:48 |
|
ericar joined #evergreen |
08:50 |
|
mmorgan joined #evergreen |
08:56 |
Dyrcona |
csharp: I don't know. I think installation from git is easier than using tarballs. |
09:04 |
|
kbeswick joined #evergreen |
09:04 |
|
mdriscoll joined #evergreen |
09:07 |
|
mrpeters joined #evergreen |
09:16 |
|
kmlussier joined #evergreen |
09:22 |
Dyrcona |
kmlussier: If you were planning on looking at my development server today, I am only loading the MVLC Customization Branches from my document on Google Drive today. |
09:22 |
kmlussier |
Dyrcona: OK, thanks for letting me know. |
09:35 |
|
RoganH joined #evergreen |
09:37 |
|
mllewellyn joined #evergreen |
09:40 |
kmlussier |
bshum / gmcharlt: I notice the link to the Evergreen logo from the wiki points to a GPLS page. Do we have a set of logos we can post on evergreen-ils.org along? It probably would also be a good idea to link to the trademark policy from that page. |
09:41 |
dbwells |
csharp: I'll push a rel_2_5_1 branch shortly, thanks for the nudge |
09:53 |
pinesol_green |
[evergreen|Dan Wells] Pull in 2.5 version upgrade files - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=3ad3d36> |
09:56 |
|
yboston joined #evergreen |
09:57 |
berick |
help me bshum kenobi, you're my only hope. mind updating 2.3.11 -> 2.3.12 on the downloads page? (maybe also 2.4.4, eeevil?) |
09:58 |
eeevil |
aye, please |
09:59 |
eeevil |
and I'll push the 2.4.4 branch, and forward-port the upgrade script |
10:00 |
dbwells |
bshum: berick: eeevil: I have it open already, so I can take care of it. |
10:00 |
csharp |
bshum_kenobi++ |
10:01 |
eeevil |
dbwells: thankee sai |
10:02 |
berick |
thanks dbwells |
10:04 |
dbwells |
berick: Should I also change the 2.3 status from 'stable' to 'security updates only' (or some other term for its current status)? |
10:04 |
berick |
dbwells: yes, please. "security updates only" sounds sane to me |
10:13 |
pinesol_green |
[evergreen|Bill Erickson] Forward port 2.3.11->2.3.12 DB upgrade - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=07040ff> |
10:16 |
dbwells |
eeevil: I copied over the 2.4.4 tarball and client files from 'previews', but I wasn't sure if you had any updates for the readme/release_notes, so I just left those be. |
10:16 |
eeevil |
dbwells: there are none, sir. thanks! |
10:17 |
jeff |
hrm. |
10:23 |
bshum |
kmlussier: gmcharlt was going to work on trademark page (and other EOB-related web pages) if I recall correctly. I didn't touch those because while the site redesign was happening, I think the discussions were still ongoing (or just recently implemented). |
10:23 |
gmcharlt |
bshum: yep -- I'll have a bit of time next week to finish that |
10:26 |
kmlussier |
ok, thanks! |
10:26 |
kmlussier |
gmcharlt++ |
10:36 |
|
kbutler joined #evergreen |
10:39 |
jeff |
i'm removing some duplicate electronic resources with located uris -- is setting deleted = true on biblio.record_entry best practice there? it does the trick, but i was surprised to still see entries in asset.call_number and asset.uri_call_number_map |
10:48 |
jeff |
if memory serves, just setting the bib to deleted in the staff client isn't possible due to the ##URI## asset.call_number entries being present. |
10:48 |
|
mcooper joined #evergreen |
10:50 |
jeff |
perhaps on >2.2 the call number check ignores the ##URI## call numbers, and the deletion trigger deletes those located uri entries normally created as a result of the 856 tags. |
10:50 |
jeff |
or perhaps not. :-) |
11:03 |
|
smyers_ joined #evergreen |
11:03 |
|
akilsdonk_ joined #evergreen |
11:03 |
pinesol_green |
[evergreen|Mike Rylander] Pushing upgrade scripts forward - <http://git.evergreen-ils.org/?p=Evergreen.git;a=commit;h=df8473e> |
11:05 |
|
akilsdonk joined #evergreen |
11:09 |
dbs |
jeff: yeah, that's always been a messy area :/ |
11:11 |
|
collum joined #evergreen |
11:18 |
* jeff |
deletes some duplicate overdrive bibs |
11:19 |
jeff |
for some reason in their xls-that-is-not-xls files, they started sending us lots of duplicates. vandelay doesn't do duplicate detection / matching within a batch. |
11:21 |
jeff |
4,198 overdrive dupes to delete, 4,198 dupes to delete... |
11:22 |
jeff |
[bunch of sql that i'm not going to try to sing here] |
11:22 |
jeff |
NO MORE duplicate overdrive bibs to delete! |
11:24 |
csharp |
jeff++ |
11:25 |
berick |
heh |
11:26 |
|
akilsdonk_ joined #evergreen |
11:29 |
|
mrpeters1 joined #evergreen |
11:59 |
|
dMiller__ joined #evergreen |
12:44 |
|
GeoffSams joined #evergreen |
12:45 |
csharp |
I say again: |
12:45 |
csharp |
reports-- |
12:46 |
RoganH |
Reports are god's judgement on us for allowing Windows to flourish. |
12:47 |
csharp |
RoganH++ |
12:48 |
tsbere |
I thought it was for allowing macs (or Apple products in general) to flourish |
12:49 |
jeff |
reports++ # especially QA reports |
12:49 |
RoganH |
God is fairly ambivalent to Macs. They're built off BSD so at least it's a clone of old school unix though it has proprietary gui on top. |
12:49 |
jeff |
find-and-fix, seek-and-destroy, etc. |
12:50 |
jeff |
scheduled QA reports that send attached PDF / xls output via e-mail only when there's something to complain about == quite helpful. |
12:53 |
jeff |
(and well worth the time required to set up jasperreports server) :-) |
12:53 |
* dbs |
ponders the notion of BSD as Old Testament God, Linux as New Testament God |
12:55 |
* RoganH |
wonders if BSD is Old Testament God then is System V like the proto Abrahamic faith? |
13:03 |
|
dMiller___ joined #evergreen |
13:04 |
* csharp |
bows to the penguin |
13:05 |
csharp |
so, I guess I'm not down on reports as a concept today, just me having to troubleshoot/create them ;-) |
13:05 |
csharp |
me_doing_reports-- |
13:05 |
csharp |
reports++ |
13:13 |
|
mjingle joined #evergreen |
13:13 |
|
mjingle left #evergreen |
13:30 |
|
smyers_ joined #evergreen |
13:30 |
|
dMiller__ joined #evergreen |
13:32 |
|
jihpringle_ joined #evergreen |
13:36 |
bshum |
mllewellyn++ cupcakes++ |
13:39 |
mllewellyn |
bshum, thanks, and you're welcome. :) |
13:46 |
|
hbrennan joined #evergreen |
13:46 |
|
rsoulliere joined #evergreen |
13:53 |
csharp |
so... those who have been through the pain of initial authority linking... any tips for speeding things up? |
13:53 |
csharp |
PINES has 1.7 million bibs |
13:54 |
csharp |
(as a side note, the authority_control_fields.pl script appears to have timed out getting the bib id list, so I modified the script so it would read the list from a file) |
13:55 |
yboston |
I know that Dyrcona posted his approach before http://blog.mvlcstaff.org/search/label/authority |
13:55 |
csharp |
yboston++ # thanks! |
13:56 |
yboston |
csharp: BTW< what version of EG are you guys runing? |
13:56 |
kmlussier |
csharp: I know the script took a really long time for C/W MARS too, but I pointed them to the same posts that yboston just shared. |
13:56 |
|
mrpeters joined #evergreen |
13:56 |
yboston |
Also, the DIG monthly meeting is starting up at 2 PM EST |
13:56 |
csharp |
ah - that's what I need - the authority control batcher |
13:57 |
csharp |
Dyrcona++ |
13:57 |
* kmlussier |
forgot about the DIG meeting. :( |
13:57 |
yboston |
kmlussier: can you attend? |
13:57 |
* csharp |
thinks of and rejects several "dig" puns |
13:58 |
kmlussier |
I'll be here, but I'll be juggling several other projects while following along. Sorry! |
13:58 |
jeff |
authority control batcher? |
13:59 |
jeff |
we don't need no steenkin' batchers. |
13:59 |
yboston |
jeff: a perl script that Dyrcona wrote to help you write out call to the auth linking script |
13:59 |
yboston |
jeff: ha |
13:59 |
Dyrcona |
csharp: The disbatcher.pl script is now a gist. |
14:00 |
csharp |
Dyrcona: yeah - I was just looking at that |
14:00 |
jeff |
yboston: i'm vaguely familiar with it, i was just going for the pun. :-) |
14:00 |
Dyrcona |
I'm also working on a blog post for my parallel ingest script for bibs. I hope to get that post up this afternoon. |
14:00 |
csharp |
my single-process script has been running for days and days |
14:00 |
Dyrcona |
Yeah, it can take a long time. |
14:01 |
yboston |
#startmeeting 2013-12-05 - DIG Monthly Meeting Evergreen Documentation Interest Group (DIG) Monthly Meeting. |
14:01 |
pinesol_green |
Meeting started Thu Dec 5 14:01:33 2013 US/Eastern. The chair is yboston. Information about MeetBot at http://wiki.debian.org/MeetBot. |
14:01 |
pinesol_green |
Useful Commands: #action #agreed #help #info #idea #link #topic. |
14:01 |
pinesol_green |
The meeting name has been set to '2013_12_05___dig_monthly_meeting_evergreen_documentation_interest_group__dig__monthly_meeting_' |
14:01 |
yboston |
The agenda can be found here http://evergreen-ils.org/dokuwiki/doku.php?id=evergreen-docs:dig_meeting_20131205-agenda |
14:01 |
yboston |
#topic Introductions |
14:01 |
yboston |
Please feel free to start introducing yourselves... |
14:02 |
kmlussier |
#info kmlussier is Kathy Lussier, MassLNC |
14:02 |
* yboston |
is Yamil Suarez @ Berklee college of Music - DIG meeting facilitator |
14:02 |
* rsoulliere |
is Robert Soulliere, Mohawk College |
14:02 |
kbutler |
/me is Kate Butler, Rodgers Memorial |
14:02 |
kbutler |
bah |
14:03 |
* hbrennan |
is Holly Brennan, Homer Public Library, AK |
14:05 |
yboston |
Lets move on, late comers can introduce themselves as they arrive |
14:05 |
hbrennan |
(I'm sorta here and sorta not.. as I run away now to get in the mail) |
14:05 |
yboston |
#topic Updates from Content Coordinators |
14:05 |
yboston |
(if there is anything to report) |
14:05 |
rsoulliere |
I can go first. |
14:05 |
rsoulliere |
#topic Conversion Coordinator Report |
14:05 |
yboston |
go ahead rsoulliere |
14:06 |
rsoulliere |
#info EG 2.5 documentation is now being processed on the documentation web server. |
14:06 |
rsoulliere |
#info I shared some information and tools with yboston regarding processing documentation from the repositories. Here are some of the tools in a repository I set up a long time ago: |
14:06 |
rsoulliere |
#link https://github.com/rsoulliere/Evergreen_Documentation_Tools |
14:06 |
rsoulliere |
#info If anyone else is interested in setting up their own documentation site for testing or experimenting and needs some technical assistance to get started, let me know. |
14:06 |
rsoulliere |
That is all. |
14:07 |
yboston |
rsoulliere++ |
14:07 |
kmlussier |
I can go next. |
14:07 |
yboston |
rsoulliere: I have a comment for you |
14:07 |
kmlussier |
But I'll wait. :) |
14:07 |
yboston |
there is still content that was worked on during the hack-a-way |
14:08 |
yboston |
some of it is large, any suggestions of how to minimize problems that break the nightly build |
14:08 |
yboston |
should we send you the files beforehand? should we load them up on a different server? |
14:09 |
yboston |
should we through a bunch on a particular day that you pick to be looking over at the errors we get? |
14:09 |
rsoulliere |
yboston: For most issues the included page with the error should only be the one to break. |
14:09 |
yboston |
I don't want to cause the nightly builds to be broken for several days |
14:10 |
rsoulliere |
Typos etc... shouldn't bring the whole documentation site to a crash. |
14:10 |
yboston |
rsoulliere: I guess we can start with a few as see how it goes. So far I just waited until the next day to see if the one page was built successfully. |
14:11 |
rsoulliere |
I would test locally using the basic ascidoc command and upload if it passes the test. |
14:11 |
rsoulliere |
I probably would load a bit at a time as you suggest. |
14:11 |
yboston |
any particular combination of parameters? |
14:11 |
rsoulliere |
If you notice anything not appearing, let me know via email and I can troubleshoot on the server. |
14:12 |
yboston |
also, I had issues with the bash source highlighting on OS X, was not sure how to fix |
14:13 |
|
dMiller___ joined #evergreen |
14:13 |
rsoulliere |
yboston re: parameters: I think the basic html conversion should be a good test. That should catch most syntax issues. |
14:13 |
yboston |
rsoulliere: OK |
14:13 |
|
jboyer_isl joined #evergreen |
14:13 |
rsoulliere |
re OSX highlighting: do you mean display issues in safari? |
14:14 |
|
ktomita___ joined #evergreen |
14:14 |
yboston |
no, that when I tried to build all of the docs, the asciidoc command line utility said it did |
14:14 |
yboston |
not know how to format/highlight bash source |
14:14 |
|
mmorgan1 joined #evergreen |
14:14 |
yboston |
I have to dig up the error |
14:15 |
rsoulliere |
Oh, processing on OSX? |
14:16 |
rsoulliere |
Let me know the error and I can help in troubleshooting. |
14:17 |
yboston |
asciidoc: WARNING: RELEASE_NOTES_2_5.txt: line 163: filter non-zero exit code: source-highlight -f xhtml -s bash: returned |
14:17 |
yboston |
asciidoc: WARNING: RELEASE_NOTES_2_5.txt: line 163: no output from filter: source-highlight -f xhtml -s bash |
14:17 |
yboston |
(found it) |
14:17 |
rsoulliere |
Via email I mean after the meeting;-). |
14:17 |
yboston |
I just wanted to give you a peak :) |
14:17 |
yboston |
any other comments on my question or for Robert? |
14:19 |
kmlussier |
None here. |
14:19 |
yboston |
Kathy, go ahead with your report or comments |
14:19 |
kmlussier |
#topic Release Coordinator Report |
14:20 |
kmlussier |
#info We have the 2.5 doc needs identified at http://evergreen-ils.org/dokuwiki/doku.php?id=evergreen-docs:2.5_needs. |
14:20 |
kmlussier |
#info Anyone who wants to help document new features can add their name to the wiki to let people know what they're working on. |
14:20 |
kmlussier |
#info I also created some draft guidelines for submitting doc needs to LP that I also shared with the list. http://evergreen-ils.org/dokuwiki/doku.php?id=evergreen-docs:lp_docs |
14:21 |
kmlussier |
#info If anyone has any suggestions for improvement, let me know. Or feel free to edit the wiki page. |
14:21 |
kmlussier |
That is all. |
14:21 |
|
dMiller__ joined #evergreen |
14:21 |
yboston |
kmlussier++ |
14:22 |
yboston |
any comments or questions for Kathy? |
14:23 |
yboston |
kmlussier: did you want to ask the conference related question now on IRC or I can do it by email? |
14:24 |
kmlussier |
yboston: Actually, I'm mulling things over a bit. Can I get back to you via e-mail on that? |
14:24 |
yboston |
OK |
14:24 |
yboston |
we can move on |
14:25 |
yboston |
...new business |
14:25 |
yboston |
#topic Post DIG hack-a-way discussion |
14:26 |
yboston |
Here is a copy of my hack-a-way recap... |
14:26 |
yboston |
#link http://georgialibraries.markmail.org/thread/k5ccpllzfhtb44b5 |
14:26 |
yboston |
I probably forgot to give credit to someone, but no one has corrected me yet |
14:26 |
yboston |
Any comments or questions? |
14:27 |
yboston |
My elevator speech about the hack-a-way, it was great for getting new folks trained on DIG workflows and asciidoc. It was hard to find small taks for volunteers to work on |
14:28 |
kbutler |
yboston: Thank you for hosting. I thought it was productive. |
14:28 |
yboston |
we still have files that were worked on that need to be pushed to the repository |
14:28 |
yboston |
kbutler: thanks |
14:29 |
yboston |
I hope by January all of the work that was started (and finished) at the hack-a-way has been integrated to the docs. |
14:30 |
yboston |
I also hope that it iwllbe easier to find tasks to give to newcomers not that we have a video tutorial to get more people u to speed |
14:30 |
yboston |
(now that we have) |
14:32 |
yboston |
Also, at the next conference, we should have a whole day to work on docs. Hope that we can apply other lesson of this hack-a-way to that hackfest |
14:32 |
yboston |
BTW< thanks to ESI, that was the test server we ended up using the most |
14:33 |
yboston |
Any comments or questions? |
14:35 |
kmlussier |
Sounds like you all got a lot accomplished. Nice work! |
14:35 |
kmlussier |
yboston++ for pulling it together. |
14:36 |
yboston |
Next year I plan to again offer to host, but perhaps we can all decide meet somewhere else in Massachusetts |
14:37 |
kmlussier |
I know a couple of places that might be willing to host. :) |
14:38 |
yboston |
Looks like today it is a day that we wrap the meeting early, since I don't have much else to cover |
14:39 |
yboston |
but let me know if we want to cover something else before we wrap up |
14:41 |
kmlussier |
Unfortunately, I'm only partially here today and can't contribute much, so I'm in favor of wrapping up. |
14:41 |
yboston |
One quick thing, |
14:41 |
yboston |
I was contacted by a representative of "Asciidoctor | An open source implementation of AsciiDoc in Ruby" |
14:41 |
yboston |
#link http://asciidoctor.org/ |
14:42 |
yboston |
Asking i few had ever considered switching to it. |
14:42 |
yboston |
Just wanted to throw that out there |
14:43 |
yboston |
we can wrap up unless someone has something to say |
14:43 |
yboston |
or ask |
14:44 |
yboston |
OK folks, thanks |
14:44 |
yboston |
#endmeeting |
14:44 |
pinesol_green |
Meeting ended Thu Dec 5 14:44:45 2013 US/Eastern. Information about MeetBot at http://wiki.debian.org/MeetBot . (v 0.1.4) |
14:44 |
pinesol_green |
Minutes: http://evergreen-ils.org/meetings/evergreen/2013/evergreen.2013-12-05-14.01.html |
14:44 |
pinesol_green |
Minutes (text): http://evergreen-ils.org/meetings/evergreen/2013/evergreen.2013-12-05-14.01.txt |
14:44 |
pinesol_green |
Log: http://evergreen-ils.org/meetings/evergreen/2013/evergreen.2013-12-05-14.01.log.html |
14:45 |
rsoulliere |
yboston++ |
14:45 |
kmlussier |
yboston++ |
14:48 |
|
Shae joined #evergreen |
14:52 |
Dyrcona |
Boy, blogging is a lot of work. No wonder I don't do it more often. |
14:52 |
jeff |
typa-typa-typa |
14:55 |
Dyrcona |
Yeah, and its less fun typing into a browser window. |
14:55 |
Dyrcona |
I sometimes type my blogs in my preferred text editor and then copy and paste. |
14:56 |
Dyrcona |
Unfortunately, I never really go the assciidoc blogpost script to work with Blogger as well as I'd like. |
14:56 |
Dyrcona |
It works great with WordPress blogs, though, 'cause I guess that is what the asciidoc author uses. |
14:57 |
jeff |
yeah, i often use that technique for things longer than a few paragraphs. |
14:57 |
berick |
thought about using the asciidoc -> wordress script. then got distracted. |
14:58 |
Dyrcona |
berick: I set up a wordpress blog a couple of years ago just to try it out. |
15:01 |
Dyrcona |
Ok, it was last year. |
15:05 |
berick |
i smell a resume bullet.. "synergizing and merging next-gen media platforms!" |
15:05 |
berick |
Dyrcona: pretty easy to get going, I take it/ |
15:05 |
berick |
er, ? |
15:06 |
Dyrcona |
berick: yes. just some simple configuration, IIRC. |
15:06 |
Dyrcona |
:) |
15:06 |
berick |
cool |
15:06 |
Dyrcona |
I was going to modify to work with blogger, but never found the time. |
15:10 |
* csharp |
sees http://www.postgresql.org/about/news/1492/ on G+ and decides to share |
15:10 |
bshum |
Whee! |
15:11 |
eeevil |
csharp: I'll re-re-re-reply to my thread about that on our lists ;) |
15:12 |
csharp |
eeevil++ |
15:17 |
bshum |
postgresql++ eeevil++ csharp++ |
15:42 |
* tsbere |
is under the belief that if you have to start your email message with "THIS IS NOT SPAM" then you are, in fact, MORE likely than normal to be sending me spam |
15:44 |
|
dMiller___ joined #evergreen |
15:53 |
|
stevenyvr2 joined #evergreen |
16:07 |
Dyrcona |
At some point, you just have to stop typing/editing and hit the "Publish" button. :) |
16:13 |
remingtron |
yboston: when publishing docs, we could use the master branch as our test version. If it breaks, it's okay because it's only the dev version! Once it's fixed, pull it into 2.5 and 2.4. |
16:13 |
|
timlaptop joined #evergreen |
16:14 |
remingtron |
yboston: I'll send this idea to the DIG list for discussion |
16:14 |
Dyrcona |
If anyone is interested in what I was doing to use the asciidoc blogpost program to post to blogger: http://blog.sigio.com/2012/05/look-ma-no-hands_15.html |
16:14 |
yboston |
remingtron: that is a great idea |
16:14 |
Dyrcona |
If anyone cares about my other, more personal, blog: http://kissmysock.wordpress.com/ |
16:15 |
Dyrcona |
I think I should blog a bit more. |
16:18 |
|
ktomita_ joined #evergreen |
16:18 |
|
ktomita____ joined #evergreen |
16:18 |
kmlussier |
remingtron++ |
16:18 |
|
ktomita_____ joined #evergreen |
16:25 |
berick |
just accidentally learned middle-clicking on the new tab button in chrome uses the text from your clipboarb as the URL for the new tab. |
16:27 |
Dyrcona |
Interesting. |
16:28 |
Dyrcona |
I still haven't figured middle clicking out with my new laptop's touchpad, yet. I've done it by accident a couple of times though. |
16:41 |
tsbere |
Fun with bash: For a script where I run a pile of git merge statements, but want to stop running them if any fail: mergeordie() { git merge "$@" || (echo "Merge Failure" && exit 1) } |
16:47 |
|
ElliotFriend joined #evergreen |
16:48 |
ElliotFriend |
I've upgraded our production server from 2.4.2 to 2.5.1. What's the best way to make sure our opac customizations (templates_override) files benefit from the updated templates files? |
16:49 |
eeevil |
ElliotFriend: diff against the 2.4.2 stock templates and implement the spirit of the diff |
16:49 |
eeevil |
would be my recommendation |
16:50 |
ElliotFriend |
eeevil: thanks! Can you elaborate on "implement the spirit of the diff"? Just manually update the files? Or somehow use `patch`? |
16:51 |
eeevil |
patch likely won't be able to figure out how to apply the changes in many cases |
16:52 |
eeevil |
so, a lot of it will be manual update |
16:52 |
eeevil |
but |
16:52 |
eeevil |
I'd do it against copies of the new stock files. don't try to update the old customized files ... make sense? |
16:53 |
ElliotFriend |
Yes, thank you! |
16:53 |
eeevil |
IOW, apply customizations to new stock copies |
16:53 |
eeevil |
np |
16:53 |
ElliotFriend |
All you evergreen people are so swell!! :-D |
16:53 |
* tsbere |
just does customizations on top of master and rebases the customizations later |
16:54 |
tsbere |
Then again, we only do "one" skin for the opac |
16:54 |
ElliotFriend |
"one" ?? |
16:54 |
eeevil |
tsbere: and... master :) (-ish) |
16:54 |
tsbere |
ElliotFriend: Apache vars turn on/off some customizations like library names and logos |
16:55 |
ElliotFriend |
aaaaahh |
16:55 |
tsbere |
One set of code, 30+ possible "tweaked versions" for us ;) |
16:55 |
tsbere |
I could do CSS with that trick too, but haven't had a need to yet |
16:56 |
ElliotFriend |
nice! I (almost) wish I needed to implement something that cool haha |
16:56 |
Dyrcona |
ElliotFriend: After reading some of the scroll back, I'd suggest using git to manage your customizations in a local branch. You just merge your customizations into the branch you want to install, rel_2_5_1 for instance, and then fix any conflicts there. |
16:59 |
ElliotFriend |
Dyrcona: that's a good idea! I'm new-ish at git, so bear with me... |
17:00 |
ElliotFriend |
when I've done the upgrades, I've just downloaded the tarball, and gone through the upgrade process. How does the var/templates directory become a git repo in which to track rel_2_5_1? |
17:01 |
ElliotFriend |
Or do I just keep the git branching local, rather than on github, git.evergreen-ils.org, etc.? |
17:02 |
Dyrcona |
I keep it local. |
17:03 |
Dyrcona |
I git clone from git.evergreen-ils.org. |
17:03 |
|
mdriscoll left #evergreen |
17:03 |
Dyrcona |
If I wanted to make a custom branch of 2.5.1, I'd then git checkout -b custom_2_5_1 origin/rel_2_5_1 |
17:04 |
Dyrcona |
I'd make my changes and commit. |
17:04 |
Dyrcona |
Then I'd build from the checked out git branch. |
17:05 |
Dyrcona |
If you have customizations that you want to keep, it would makes sent to build them off of rel_2_5 and just pull the latest changes from origin when you want to update. |
17:05 |
Dyrcona |
s/makes sent/make sense/ |
17:06 |
Dyrcona |
One trick I've come up with is to assemble my custom branches on my laptop. |
17:06 |
Dyrcona |
I create bare git repos for evergreen and opensrf on my servers. |
17:06 |
|
mmorgan1 left #evergreen |
17:07 |
Dyrcona |
I add remote entries in my laptop's git for the bare repos, so I can push my branches to the bare repos on the server. |
17:07 |
Dyrcona |
On the server, I then clone the bare repos and checkout the branch that I want to build. |
17:08 |
Dyrcona |
That assumes, of course, you have easy access to your servers from your workstation. |
17:08 |
ElliotFriend |
We're just a one-server kinda library, and I do have easy access. |
17:09 |
ElliotFriend |
So, I git clone onto the server (or my laptop) not for installation/building, but just for tweaking the template files? Or could (should?) I install/upgrade from there, as well? |
17:10 |
Dyrcona |
You could install from there as well if it is on the server. I like the bare repo setup for various logistical reasons. |
17:11 |
Dyrcona |
On my personal website, for instance, I edit things on my laptop, push to the bare repo on the server. |
17:11 |
ElliotFriend |
So, your workflow looks like... |
17:11 |
Dyrcona |
When I'm ready to "install" my changes to my live site, I just git pull in my site's directory. |
17:11 |
ElliotFriend |
clone from upstream/master (git.evergren-ils.org) onto your laptop |
17:12 |
Dyrcona |
yes. |
17:12 |
ElliotFriend |
checkout and configure your custom branch(es) |
17:12 |
Dyrcona |
yes |
17:12 |
ElliotFriend |
push (pull?) to dev/stage/production/whatever you call them |
17:12 |
Dyrcona |
push, yes. |
17:13 |
ElliotFriend |
and then do you run through the installation/upgrade process? or is that part of what you do on your laptop? |
17:13 |
Dyrcona |
I do it on the server. |
17:13 |
Dyrcona |
so, the next step is ssh to the server. |
17:13 |
Dyrcona |
cd to the clone of my bare repo. |
17:14 |
Dyrcona |
git fetch followed by git checkout branchname |
17:14 |
Dyrcona |
then do the installation steps. |
17:15 |
ElliotFriend |
branchname, meaning whatever custom branch you put together on your laptop, right? |
17:15 |
Dyrcona |
right |
17:15 |
ElliotFriend |
I think I got it now :-) |
17:16 |
Dyrcona |
the bare repo is optional, but I like it because it makes it easy to clone onto other servers if you have more than one. |
17:16 |
|
dcook joined #evergreen |
17:16 |
Dyrcona |
It's also handy if you want a clean copy of the repo to clone from that doesn't get cluttered with build files, etc. |
17:16 |
jeff |
ounce of prevention is worth... well, it saves you from inn-reach loops and such: https://github.com/jonscott/iNCIPit/pull/7 |
17:17 |
jeff |
(unrelated to current topic, sorry) |
17:17 |
Dyrcona |
jeff: I haven't checked the repo in a while has anyone been merging your changes? |
17:20 |
Dyrcona |
366 insertions(+), 242 deletions(-): Something has been going on. |
17:20 |
jeff |
dbwells merged #4, which was everything up through the beginning of the month. |
17:21 |
jeff |
big changes. good changes, apparently. :-) |
17:21 |
Dyrcona |
I took two weeks vacation last month and really did not look at Evergreen-related thing much at all. |
17:22 |
Dyrcona |
Now, I wonder if my typos and omissions are my fault or if my keyboard is to blame. |
17:23 |
jeff |
receiving the "are melcat and evergreen talking okay?" call resulted in me checking the logs and responding, "nope, they're having an argument at the moment..." |
17:23 |
* Dyrcona |
waits for the replacement keyboard from System76. |
17:23 |
Dyrcona |
kohadevoptionsreactions++ :) |
17:23 |
Dyrcona |
The NCIP one is spot on. |
17:24 |
dcook |
hehe |
17:24 |
jeff |
non-stacking control-D in xml... thanks! |
17:24 |
ElliotFriend |
Dyrcona: about that bare repo, do you push like laptop -> dev, dev -> staging, staging -> production? or is it laptop -> dev, laptop -> staging, laptop -> production |
17:24 |
ElliotFriend |
I think you're saying the first one, right? |
17:24 |
Dyrcona |
more like the first one, yes. |
17:25 |
ElliotFriend |
with all that said, what would be the best way to move towards a workflow like that, as opposed to the way I'm doing it? |
17:26 |
ElliotFriend |
Set it up like that on a new set of servers? |
17:26 |
Dyrcona |
Do you have a server that you use for testing or development? |
17:27 |
Dyrcona |
I'd try it out on a test server to start with. |
17:27 |
ElliotFriend |
Both are VMs. I have a test server that is a clone of the production one |
17:27 |
Dyrcona |
I'd set it up on the test vm first. |
17:27 |
ElliotFriend |
I only ever spin up the test one to run through an upgrade, before applying it to production |
17:27 |
ElliotFriend |
sounds good |
17:28 |
Dyrcona |
It is about time for me to head home. I can sign back in when I get there if you want to discuss the work flow some more. |
17:29 |
ElliotFriend |
I think I'm alright. Thanks again! I repeat, Evergreen people sure are swell! |
17:31 |
Dyrcona |
You are welcome. |
17:31 |
Dyrcona |
g'night for now, folks! |
17:35 |
GeoffSams |
@weather 76262 |
17:35 |
pinesol_green |
GeoffSams: The current temperature in Roanoke, Texas is 29.5°F (4:32 PM CST on December 05, 2013). Conditions: Light Freezing Rain. Humidity: 86%. Dew Point: 26.6°F. Windchill: 24.8°F. Pressure: 30.12 in 1020 hPa (Falling). Winter Storm Warning in effect until 6 PM CST Friday... |
17:36 |
GeoffSams |
looks like I'm going home |
17:36 |
dcook |
Wow... |
17:37 |
dcook |
Wait... |
17:37 |
* dcook |
has no idea what 29.5 F is |
17:37 |
gsams |
-2.5 C |
17:37 |
gsams |
I think |
17:37 |
dcook |
I didn't know Texas got that chilly! |
17:37 |
gsams |
Texas is all sorts of crazy |
17:37 |
dcook |
hehe |
17:37 |
gsams |
It was 81 F yesterday |
17:38 |
dcook |
@weather sydney australia |
17:38 |
pinesol_green |
dcook: The current temperature in Sydney Airport, New South Wales is 62.6°F (9:00 AM EST on December 06, 2013). Conditions: Partly Cloudy. Humidity: 22%. Dew Point: 33.8°F. Pressure: 29.88 in 1012 hPa (Rising). |
17:38 |
dcook |
I'm certainly it's warmer than that right now.. |
17:38 |
dcook |
27 C in December? That sounds a bit more reasonable...sort of |
17:38 |
dcook |
Have a good afternoon/evening! |
17:38 |
gsams |
you too! |
17:54 |
|
ktomita joined #evergreen |
17:54 |
|
ktomita__ joined #evergreen |
17:54 |
|
ktomita___ joined #evergreen |
17:57 |
* jeff |
yawns |
18:05 |
|
RBecker joined #evergreen |
18:38 |
|
smyers_ joined #evergreen |
18:38 |
|
ktomita_ joined #evergreen |
18:38 |
|
ktomita____ joined #evergreen |
18:38 |
|
ktomita_____ joined #evergreen |
18:38 |
|
egbuilder joined #evergreen |
18:45 |
|
ktomita joined #evergreen |
18:45 |
|
ktomita___ joined #evergreen |
18:45 |
|
ktomita__ joined #evergreen |
18:45 |
|
smyers__ joined #evergreen |
18:46 |
|
ktomita______ joined #evergreen |
18:46 |
|
ktomita_______ joined #evergreen |
18:46 |
|
ktomita________ joined #evergreen |
18:53 |
|
Guest40903 joined #evergreen |
18:57 |
|
RBecker joined #evergreen |
19:13 |
|
sseng joined #evergreen |
19:26 |
|
ktomita joined #evergreen |
19:44 |
|
ktomita_ joined #evergreen |
20:06 |
|
mrpeters joined #evergreen |
20:13 |
|
stevenyvr2 left #evergreen |
21:08 |
|
smyers_ joined #evergreen |
23:12 |
|
stevenyvr2 joined #evergreen |
23:12 |
|
stevenyvr2 left #evergreen |